Fix project loading

shoo · Aug 26, 2019 · 443d174 · 443d174
1 parent 45c278e
commit 443d174
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/source/gendoc/config.d b/source/gendoc/config.d
@@ -38,7 +38,6 @@ struct PackageConfig
 			dub.loadPackage(pkg);
 		scope (exit) if (pkg)
 			dub.loadPackage(bkupPkg);
-		dub.project.reinit();
 		if (!dub.project.hasAllDependencies)
 			dub.upgrade(UpgradeOptions.select);
 
@@ -78,7 +77,8 @@ struct PackageConfig
 			PackageConfig pkgcfg;
 			if (spkg.recipe.name.length > 0)
 			{
-				auto subpkg = dub.packageManager.getSubPackage(dub.project.rootPackage, spkg.recipe.name, false);
+				auto basepkg = dub.packageManager.getPackage(name, packageVersion);
+				auto subpkg = dub.packageManager.getSubPackage(basepkg, spkg.recipe.name, false);
 				pkgcfg.loadPackage(dub, subpkg,
 					archType, buildType, configName, compiler);
 			}
@@ -92,6 +92,7 @@ struct PackageConfig
 			subPackages ~= pkgcfg;
 		}
 	}
+
 	/// ditto
 	void loadPackage(
 		string dir,
@@ -108,7 +109,6 @@ struct PackageConfig
 			compiler = dub.defaultCompiler;
 		if (archType.length == 0)
 			archType = dub.defaultArchitecture;
-		auto tmppkg = dub.packageManager.getOrLoadPackage(NativePath(absDir), NativePath.init, true);
 		dub.loadPackage();
 		loadPackage(dub, null,
 			archType,