Merge pull request dlang#561 from Abscissa/fix-560

Fix dlang#560: --import-paths error when "configurations" section exists
Abscissa · May 3, 2015 · e3bf00c · e3bf00c
2 parents e61a104 + f788a2b
commit e3bf00c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/source/dub/project.d b/source/dub/project.d
@@ -593,7 +593,7 @@ class Project {
 		auto fullPackagePaths(Package pack) {
 			// Return full paths for the import paths, making sure a
 			// directory separator is on the end of each path.
-			return __traits(getMember, pack.getBuildSettings(platform, config), attributeName)
+			return __traits(getMember, pack.getBuildSettings(platform, configs[pack.name]), attributeName)
 			.map!(importPath => buildPath(pack.path.toString(), importPath))
 			.map!(path => path.endsWith(dirSeparator) ? path : path ~ dirSeparator);
 		}

diff --git a/test/describe-dependency-1/dub.json b/test/describe-dependency-1/dub.json
@@ -5,5 +5,10 @@
     "authors": ["nobody"],
     "homepage": "fake.com",
     "license": "BSD 2-clause",
-    "copyright": "Copyright © 2015, nobody"
+    "copyright": "Copyright © 2015, nobody",
+	"configurations": [
+		{
+			"name": "my-dependency-1-config"
+		}
+	],
 }
diff --git a/test/describe-project/dub.json b/test/describe-project/dub.json
@@ -15,5 +15,13 @@
             "version": "1.0",
             "path": "../describe-dependency-2"
         }
-    }
+    },
+	"configurations": [
+		{
+			"name": "my-project-config"
+		}
+	],
+	"subConfigurations": {
+		"describe-dependency-1": "my-dependency-1-config"
+	},
 }