Skip to content

Commit 443d174

Browse files
committed
Fix project loading
1 parent 45c278e commit 443d174

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: source/gendoc/config.d

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ struct PackageConfig
3838
dub.loadPackage(pkg);
3939
scope (exit) if (pkg)
4040
dub.loadPackage(bkupPkg);
41-
dub.project.reinit();
4241
if (!dub.project.hasAllDependencies)
4342
dub.upgrade(UpgradeOptions.select);
4443

@@ -78,7 +77,8 @@ struct PackageConfig
7877
PackageConfig pkgcfg;
7978
if (spkg.recipe.name.length > 0)
8079
{
81-
auto subpkg = dub.packageManager.getSubPackage(dub.project.rootPackage, spkg.recipe.name, false);
80+
auto basepkg = dub.packageManager.getPackage(name, packageVersion);
81+
auto subpkg = dub.packageManager.getSubPackage(basepkg, spkg.recipe.name, false);
8282
pkgcfg.loadPackage(dub, subpkg,
8383
archType, buildType, configName, compiler);
8484
}
@@ -92,6 +92,7 @@ struct PackageConfig
9292
subPackages ~= pkgcfg;
9393
}
9494
}
95+
9596
/// ditto
9697
void loadPackage(
9798
string dir,
@@ -108,7 +109,6 @@ struct PackageConfig
108109
compiler = dub.defaultCompiler;
109110
if (archType.length == 0)
110111
archType = dub.defaultArchitecture;
111-
auto tmppkg = dub.packageManager.getOrLoadPackage(NativePath(absDir), NativePath.init, true);
112112
dub.loadPackage();
113113
loadPackage(dub, null,
114114
archType,

0 commit comments

Comments
 (0)