merge stable (#2014)

Fork: 0

johnpearcey / dub_jkp

Browse code merge stable (#2014) * Fix bogus warning for non-path based dependencies. Introduced by #1974. * update version to v1.23.0-rc.1 Co-authored-by: Sönke Ludwig <sludwig@outerproduct.org> master
1 parent 725a5bc commit 29d33f2956f42f9d075cf10e483866bda0f2a6eb Martin Nowak authored on 18 Sep 2020 GitHub committed on 18 Sep 2020

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          source/dub/dub.d
 					auto altdeppath = d.name == dbasename ? basepack.path : subpack.path;
					altdeppath.endsWithSlash = true;
 
					if (absdeppath != desireddeppath)
					if (!d.spec.path.empty && absdeppath != desireddeppath)
						logWarn("Warning: Sub package %s, referenced by %s %s must be referenced using the path to its base package",
							subpack.name, pack.name, pack.version_);
 
					enforce(d.spec.path.empty || absdeppath == desireddeppath || absdeppath == altdeppath,
 					auto altdeppath = d.name == dbasename ? basepack.path : subpack.path;
 					altdeppath.endsWithSlash = true;
+					if (absdeppath != desireddeppath)
+					if (!d.spec.path.empty && absdeppath != desireddeppath)
 						logWarn("Warning: Sub package %s, referenced by %s %s must be referenced using the path to its base package",
 							subpack.name, pack.name, pack.version_);
 					enforce(d.spec.path.empty || absdeppath == desireddeppath || absdeppath == altdeppath,

Ignore Space Show notes View

■■■■■

source/dub/version_.d

Show line notes below