[break API to make it slightly less ugly]

Author: kinke

source/dub/commandline.d

@@ -887,7 +887,7 @@ class Command {
 		dub.mainRecipePath = options.recipeFile;
 		// make the CWD package available so that for example sub packages can reference their
 		// parent package.
-		try dub.packageManager.getOrLoadPackage(NativePath(options.root_path), NativePath(options.recipeFile), false, StrictMode.Warn);
+		try dub.packageManager.getOrLoadPackage(NativePath(options.root_path), NativePath(options.recipeFile), PackageName.init, StrictMode.Warn);
 		catch (Exception e) {
 			// by default we ignore CWD package load fails in prepareDUB, since
 			// they will fail again later when they are actually requested. This

source/dub/dub.d

@@ -515,7 +515,7 @@ class Dub {
 	void loadPackage(NativePath path)
 	{
 		auto pack = this.m_packageManager.getOrLoadPackage(
-			path, NativePath.init, false, StrictMode.Warn);
+			path, NativePath.init, PackageName.init, StrictMode.Warn);
 		this.loadPackage(pack);
 	}
 
@@ -1956,8 +1956,7 @@ private class DependencyVersionResolver : DependencyResolver!(Dependency, Depend
 		if (!dep.path.empty) {
 			try {
 				// note: would handle sub-packages directly
-				return m_dub.packageManager.getOrLoadPackage(dep.path, NativePath.init, false,
-					StrictMode.Ignore, name);
+				return m_dub.packageManager.getOrLoadPackage(dep.path, NativePath.init, name);
 			} catch (Exception e) {
 				logDiagnostic("Failed to load path based dependency %s: %s", name, e.msg);
 				logDebug("Full error: %s", e.toString().sanitize);

source/dub/packagemanager.d

@@ -271,8 +271,7 @@ class PackageManager {
 				foreach (ovr; repo.overrides)
 					if (ovr.package_ == name.toString() && ovr.source.matches(ver)) {
 						Package pack = ovr.target.match!(
-							(NativePath path) => getOrLoadPackage(path, NativePath.init, false,
-									StrictMode.Ignore, name),
+							(NativePath path) => getOrLoadPackage(path, NativePath.init, name),
 							(Version	vers) => getPackage(name, vers, false),
 						);
 						if (pack) return pack;
@@ -378,17 +377,14 @@ class PackageManager {
 		Params:
 			path = NativePath to the root directory of the package
 			recipe_path = Optional path to the recipe file of the package
-			allow_sub_packages = Also return an already-loaded sub package if it resides in the given folder.
-			                     Ignored when specifying `name`, as a matching already-loaded sub package is always returned in that case.
+			name = Optional (sub-)package name if known in advance. Required if a sub-package is to be returned.
 			mode = Whether to issue errors, warning, or ignore unknown keys in dub.json
-			name = Optional (sub-)package name if known in advance
 
 		Returns: The packages loaded from the given path
 		Throws: Throws an exception if no package can be loaded
 	*/
 	Package getOrLoadPackage(NativePath path, NativePath recipe_path = NativePath.init,
-		bool allow_sub_packages = false, StrictMode mode = StrictMode.Ignore,
-		PackageName name = PackageName.init)
+		PackageName name = PackageName.init, StrictMode mode = StrictMode.Ignore)
 	{
 		path.endsWithSlash = true;
 		const nameString = name.toString();
@@ -398,7 +394,7 @@ class PackageManager {
 				if (p.name == nameString && (p.path == path || p.basePackage.path == path))
 					return p;
 			} else {
-				if (p.path == path && (!p.parentPackage || (allow_sub_packages && p.parentPackage.path != p.path)))
+				if (p.path == path && !p.parentPackage)
 					return p;
 			}
 		}

source/dub/project.d

@@ -67,7 +67,7 @@ class Project {
 			logWarn("There was no package description found for the application in '%s'.", project_path.toNativeString());
 			pack = new Package(PackageRecipe.init, project_path);
 		} else {
-			pack = package_manager.getOrLoadPackage(project_path, packageFile, false, StrictMode.Warn);
+			pack = package_manager.getOrLoadPackage(project_path, packageFile, PackageName.init, StrictMode.Warn);
 		}
 
 		this(package_manager, pack);
@@ -553,8 +553,7 @@ class Project {
 				p = vspec.visit!(
 					(NativePath path_) {
 						auto path = path_.absolute ? path_ : m_rootPackage.path ~ path_;
-						return m_packageManager.getOrLoadPackage(path, NativePath.init, false,
-							StrictMode.Ignore, dep.name);
+						return m_packageManager.getOrLoadPackage(path, NativePath.init, dep.name);
 					},
 					(Repository repo) {
 						return m_packageManager.loadSCMPackage(dep.name, repo);
@@ -587,8 +586,7 @@ class Project {
 					NativePath path = vspec.path;
 					if (!path.absolute) path = pack.path ~ path;
 					logDiagnostic("%sAdding local %s in %s", indent, dep.name, path);
-					p = m_packageManager.getOrLoadPackage(path, NativePath.init, false,
-						StrictMode.Ignore, dep.name);
+					p = m_packageManager.getOrLoadPackage(path, NativePath.init, dep.name);
 					path.endsWithSlash = true;
 					if (path != p.basePackage.path) {
 						logWarn("%sSub package %s must be referenced using the path to it's parent package.", indent, dep.name);