diff --git a/source/app.d b/source/app.d index 33045c7..860d7ef 100644 --- a/source/app.d +++ b/source/app.d @@ -202,10 +202,10 @@ enforce(!place_locally || !place_system_wide, "Cannot place package locally and system wide at the same time."); if (place_locally) location = PlacementLocation.local; else if (place_system_wide) location = PlacementLocation.systemWide; - if (retrieved_version.length) dub.get(name, Dependency(retrieved_version), location, true); + if (retrieved_version.length) dub.fetch(name, Dependency(retrieved_version), location, true); else { try { - dub.get(name, Dependency(">=0.0.0"), location, true); + dub.fetch(name, Dependency(">=0.0.0"), location, true); logInfo( "Please note that you need to use `dub run ` " ~ "or add it to dependencies of your package to actually use/run it. " ~ @@ -214,7 +214,7 @@ catch(Exception e){ logInfo("Getting a release version failed: %s", e.msg); logInfo("Retry with ~master..."); - dub.get(name, Dependency("~master"), location, true); + dub.fetch(name, Dependency("~master"), location, true); } } break; diff --git a/source/dub/dub.d b/source/dub/dub.d index ba5f1ca..91eebf3 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -168,7 +168,7 @@ remove(a.pack); } foreach(Action a; filter!((Action a) => a.type == Action.Type.get)(actions)) { - get(a.packageId, a.vers, a.location, (options & UpdateOptions.Upgrade) != 0); + fetch(a.packageId, a.vers, a.location, (options & UpdateOptions.Upgrade) != 0); // never update the same package more than once masterVersionUpgrades[a.packageId] = true; } @@ -201,8 +201,8 @@ /// Returns all cached packages as a "packageId" = "version" associative array string[string] cachedPackages() const { return m_project.cachedPackagesIDs(); } - /// Gets the package matching the dependency into the application. - Package get(string packageId, const Dependency dep, PlacementLocation location, bool force_branch_upgrade) + /// Fetches the package matching the dependency and places it in the specified location. + Package fetch(string packageId, const Dependency dep, PlacementLocation location, bool force_branch_upgrade) { Json pinfo; PackageSupplier supplier; @@ -236,7 +236,7 @@ } } - logInfo("Getting %s %s...", packageId, ver); + logInfo("Fetching %s %s...", packageId, ver); logDiagnostic("Acquiring package zip file"); auto dload = m_projectPath ~ ".dub/temp/downloads"; @@ -370,7 +370,7 @@ if (!ddox_pack) ddox_pack = m_packageManager.getBestPackage("ddox", "~master"); if (!ddox_pack) { logInfo("DDOX is not present, getting it and storing user wide"); - ddox_pack = get("ddox", Dependency(">=0.0.0"), PlacementLocation.userWide, false); + ddox_pack = fetch("ddox", Dependency(">=0.0.0"), PlacementLocation.userWide, false); } version(Windows) auto ddox_exe = "ddox.exe";