Skip to content

Commit

Permalink
Trivial: Replace redundant variable rootpack
Browse files Browse the repository at this point in the history
There was already a 'basename' defined at the start
of the function, hence there is no need to reinvent
the wheel by doing a manual split.
  • Loading branch information
Geod24 committed Jan 14, 2024
1 parent d529b1b commit 95bf3a2
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions source/dub/dub.d
Original file line number Diff line number Diff line change
Expand Up @@ -1888,10 +1888,8 @@ private class DependencyVersionResolver : DependencyResolver!(Dependency, Depend

auto prerelease = (m_options & UpgradeOptions.preRelease) != 0;

auto rootpack = name.split(":")[0];

foreach (ps; m_dub.m_packageSuppliers) {
if (rootpack == name) {
if (basename == name) {
try {
auto desc = ps.fetchPackageRecipe(name, VersionRange(vers, vers), prerelease);
if (desc.type == Json.Type.null_)
Expand All @@ -1910,16 +1908,16 @@ private class DependencyVersionResolver : DependencyResolver!(Dependency, Depend
try {
FetchOptions fetchOpts;
fetchOpts |= prerelease ? FetchOptions.usePrerelease : FetchOptions.none;
m_dub.fetch(rootpack, vers, m_dub.defaultPlacementLocation, fetchOpts, "need sub package description");
m_dub.fetch(basename, vers, m_dub.defaultPlacementLocation, fetchOpts, "need sub package description");
auto ret = m_dub.m_packageManager.getBestPackage(name, vers);
if (!ret) {
logWarn("Package %s %s doesn't have a sub package %s", rootpack, dep, name);
logWarn("Package %s %s doesn't have a sub package %s", basename, dep, name);
return null;
}
m_remotePackages[key] = ret;
return ret;
} catch (Exception e) {
logDiagnostic("Package %s could not be downloaded from %s: %s", rootpack, ps.description, e.msg);
logDiagnostic("Package %s could not be downloaded from %s: %s", basename, ps.description, e.msg);
logDebug("Full error: %s", e.toString().sanitize);
}
}
Expand Down

0 comments on commit 95bf3a2

Please sign in to comment.