Revert "Fix #2691: Use same structure for managed and unmanaged path"

This reverts commit 1a53049.
dlang · Feb 16, 2024 · 6d8c584 · 6d8c584
1 parent 85a78c0
commit 6d8c584
Show file tree

Hide file tree

Showing 33 changed files with 26 additions and 11 deletions.
diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d
@@ -1453,7 +1453,7 @@ package struct Location {
 
 			// Managed structure: $ROOT/$NAME/$VERSION/$NAME
 			// This is the most common code path
-			else {
+			else if (mgr.isManagedPath(path)) {
 				// Iterate over versions of a package
 				foreach (versdir; mgr.iterateDirectory(pack_path)) {
 					if (!versdir.isDirectory) continue;

diff --git a/...onfiguration-resolution/a/1.0.0/a/dub.sdl → ...ue1005-configuration-resolution/a/dub.sdl b/...onfiguration-resolution/a/1.0.0/a/dub.sdl → ...ue1005-configuration-resolution/a/dub.sdl
diff --git a/...onfiguration-resolution/b/1.0.0/b/dub.sdl → ...ue1005-configuration-resolution/b/dub.sdl b/...onfiguration-resolution/b/1.0.0/b/dub.sdl → ...ue1005-configuration-resolution/b/dub.sdl
diff --git a/...iguration-resolution/b/1.0.0/b/source/b.d → ...005-configuration-resolution/b/source/b.d b/...iguration-resolution/b/1.0.0/b/source/b.d → ...005-configuration-resolution/b/source/b.d
diff --git a/...onfiguration-resolution/c/1.0.0/c/dub.sdl → ...ue1005-configuration-resolution/c/dub.sdl b/...onfiguration-resolution/c/1.0.0/c/dub.sdl → ...ue1005-configuration-resolution/c/dub.sdl
diff --git a/...tion-resolution/main/~master/main/dub.sdl → ...005-configuration-resolution/main/dub.sdl b/...tion-resolution/main/~master/main/dub.sdl → ...005-configuration-resolution/main/dub.sdl
diff --git a/...resolution/main/~master/main/source/app.d → ...onfiguration-resolution/main/source/app.d b/...resolution/main/~master/main/source/app.d → ...onfiguration-resolution/main/source/app.d
diff --git a/test/issue1024-selective-upgrade.sh b/test/issue1024-selective-upgrade.sh
@@ -2,13 +2,13 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue1024-selective-upgrade
-echo "{\"fileVersion\": 1,\"versions\": {\"a\": \"1.0.0\", \"b\": \"1.0.0\"}}" > main/~master/main/dub.selections.json
-$DUB upgrade --bare --root=main/~master/main/ a
+echo "{\"fileVersion\": 1,\"versions\": {\"a\": \"1.0.0\", \"b\": \"1.0.0\"}}" > main/dub.selections.json
+$DUB upgrade --bare --root=main a
 
-if ! grep -c -e "\"a\": \"1.0.1\"" main/~master/main/dub.selections.json; then
+if ! grep -c -e "\"a\": \"1.0.1\"" main/dub.selections.json; then
 	die $LINENO "Specified dependency was not upgraded."
 fi
 
-if grep -c -e "\"b\": \"1.0.1\"" main/~master/main/dub.selections.json; then
+if grep -c -e "\"b\": \"1.0.1\"" main/dub.selections.json; then
 	die $LINENO "Non-specified dependency got upgraded."
 fi
diff --git a/...e1024-selective-upgrade/a/1.0.0/a/dub.sdl → ...sue1024-selective-upgrade/a-1.0.0/dub.sdl b/...e1024-selective-upgrade/a/1.0.0/a/dub.sdl → ...sue1024-selective-upgrade/a-1.0.0/dub.sdl
diff --git a/...e1024-selective-upgrade/a/1.0.1/a/dub.sdl → ...sue1024-selective-upgrade/a-1.0.1/dub.sdl b/...e1024-selective-upgrade/a/1.0.1/a/dub.sdl → ...sue1024-selective-upgrade/a-1.0.1/dub.sdl
diff --git a/...e1024-selective-upgrade/b/1.0.0/b/dub.sdl → ...sue1024-selective-upgrade/b-1.0.0/dub.sdl b/...e1024-selective-upgrade/b/1.0.0/b/dub.sdl → ...sue1024-selective-upgrade/b-1.0.0/dub.sdl
diff --git a/...e1024-selective-upgrade/b/1.0.1/b/dub.sdl → ...sue1024-selective-upgrade/b-1.0.1/dub.sdl b/...e1024-selective-upgrade/b/1.0.1/b/dub.sdl → ...sue1024-selective-upgrade/b-1.0.1/dub.sdl
diff --git a/...lective-upgrade/main/~master/main/dub.sdl → .../issue1024-selective-upgrade/main/dub.sdl b/...lective-upgrade/main/~master/main/dub.sdl → .../issue1024-selective-upgrade/main/dub.sdl
diff --git a/test/issue564-invalid-upgrade-dependency.sh b/test/issue564-invalid-upgrade-dependency.sh
@@ -2,4 +2,7 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue564-invalid-upgrade-dependency
-${DUB} build -f --bare --compiler=${DC} main
+rm -rf a-1.0.0/.dub
+rm -rf a-1.1.0/.dub
+rm -rf main/.dub
+${DUB} build --bare --compiler=${DC} main
diff --git a/...lid-upgrade-dependency/a/1.0.0/a/dub.json → ...valid-upgrade-dependency/a-1.0.0/dub.json b/...lid-upgrade-dependency/a/1.0.0/a/dub.json → ...valid-upgrade-dependency/a-1.0.0/dub.json
diff --git a/...d-upgrade-dependency/a/1.0.0/a/source/a.d → ...lid-upgrade-dependency/a-1.0.0/source/a.d b/...d-upgrade-dependency/a/1.0.0/a/source/a.d → ...lid-upgrade-dependency/a-1.0.0/source/a.d
diff --git a/...lid-upgrade-dependency/a/1.1.0/a/dub.json → ...valid-upgrade-dependency/a-1.1.0/dub.json b/...lid-upgrade-dependency/a/1.1.0/a/dub.json → ...valid-upgrade-dependency/a-1.1.0/dub.json
diff --git a/...d-upgrade-dependency/a/1.1.0/a/source/a.d → ...lid-upgrade-dependency/a-1.1.0/source/a.d b/...d-upgrade-dependency/a/1.1.0/a/source/a.d → ...lid-upgrade-dependency/a-1.1.0/source/a.d
diff --git a/...ade-dependency/main/~master/main/dub.json → ...-invalid-upgrade-dependency/main/dub.json b/...ade-dependency/main/~master/main/dub.json → ...-invalid-upgrade-dependency/main/dub.json
diff --git a/test/issue564-invalid-upgrade-dependency/main/dub.selections.json b/test/issue564-invalid-upgrade-dependency/main/dub.selections.json
@@ -0,0 +1,6 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"a": "1.0.0"
+	}
+}
diff --git a/...dependency/main/~master/main/source/app.d → ...alid-upgrade-dependency/main/source/app.d b/...dependency/main/~master/main/source/app.d → ...alid-upgrade-dependency/main/source/app.d
diff --git a/test/issue813-pure-sub-dependency.sh b/test/issue813-pure-sub-dependency.sh
@@ -2,5 +2,8 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue813-pure-sub-dependency
-rm -f main/~master/main/dub.selections.json
-${DUB} build -f --bare --compiler=${DC} main
+rm -rf main/.dub
+rm -rf sub/.dub
+rm -rf sub/sub/.dub
+rm -f main/dub.selections.json
+${DUB} build --bare --compiler=${DC} main
diff --git a/...-sub-dependency/main/~master/main/dub.sdl → ...issue813-pure-sub-dependency/main/dub.sdl b/...-sub-dependency/main/~master/main/dub.sdl → ...issue813-pure-sub-dependency/main/dub.sdl
diff --git a/...ub-dependency/main/~master/main/src/app.d → ...sue813-pure-sub-dependency/main/src/app.d b/...ub-dependency/main/~master/main/src/app.d → ...sue813-pure-sub-dependency/main/src/app.d
diff --git a/...re-sub-dependency/sub/~master/sub/dub.sdl → .../issue813-pure-sub-dependency/sub/dub.sdl b/...re-sub-dependency/sub/~master/sub/dub.sdl → .../issue813-pure-sub-dependency/sub/dub.sdl
diff --git a/...ub-dependency/sub/~master/sub/sub/dub.sdl → ...ue813-pure-sub-dependency/sub/sub/dub.sdl b/...ub-dependency/sub/~master/sub/sub/dub.sdl → ...ue813-pure-sub-dependency/sub/sub/dub.sdl
diff --git a/...ndency/sub/~master/sub/sub/src/sub/test.d → ...ure-sub-dependency/sub/sub/src/sub/test.d b/...ndency/sub/~master/sub/sub/src/sub/test.d → ...ure-sub-dependency/sub/sub/src/sub/test.d
diff --git a/test/issue923-subpackage-deps.sh b/test/issue923-subpackage-deps.sh
@@ -2,10 +2,13 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue923-subpackage-deps
-rm -f main/~master/main/dub.selections.json
-${DUB} build -f --bare --compiler=${DC} main
+rm -rf main/.dub
+rm -rf a/.dub
+rm -rf b/.dub
+rm -f main/dub.selections.json
+${DUB} build --bare --compiler=${DC} main
 
 
-if ! grep -c -e \"b\" main/~master/main/dub.selections.json; then
+if ! grep -c -e \"b\" main/dub.selections.json; then
 	die $LINENO 'Dependency b not resolved.'
 fi
diff --git a/...ssue923-subpackage-deps/a/1.0.0/a/dub.sdl → test/issue923-subpackage-deps/a/dub.sdl b/...ssue923-subpackage-deps/a/1.0.0/a/dub.sdl → test/issue923-subpackage-deps/a/dub.sdl
diff --git a/...ssue923-subpackage-deps/b/1.0.0/b/dub.sdl → test/issue923-subpackage-deps/b/dub.sdl b/...ssue923-subpackage-deps/b/1.0.0/b/dub.sdl → test/issue923-subpackage-deps/b/dub.sdl
diff --git a/...e923-subpackage-deps/b/1.0.0/b/source/b.d → test/issue923-subpackage-deps/b/source/b.d b/...e923-subpackage-deps/b/1.0.0/b/source/b.d → test/issue923-subpackage-deps/b/source/b.d
diff --git a/...subpackage-deps/main/~master/main/dub.sdl → test/issue923-subpackage-deps/main/dub.sdl b/...subpackage-deps/main/~master/main/dub.sdl → test/issue923-subpackage-deps/main/dub.sdl
diff --git a/...ckage-deps/main/~master/main/source/app.d → ...ssue923-subpackage-deps/main/source/app.d b/...ckage-deps/main/~master/main/source/app.d → ...ssue923-subpackage-deps/main/source/app.d