Let "*" match any version or branch. Fixes #151.

dlang · Mar 28, 2014 · 31fd5cb · 31fd5cb
1 parent 1f4b9b7
commit 31fd5cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/source/dub/dependency.d b/source/dub/dependency.d
@@ -241,6 +241,7 @@ struct Dependency {
 	bool matches(string vers) const { return matches(Version(vers)); }
 	bool matches(const(Version) v) const { return matches(v); }
 	bool matches(ref const(Version) v) const {
+		if (this == ANY) return true;
 		//logDebug(" try match: %s with: %s", v, this);
 		// Master only matches master
 		if(m_versA.isBranch) {
@@ -259,6 +260,8 @@ struct Dependency {
 	/// Merges to versions
 	Dependency merge(ref const(Dependency) o)
 	const {
+		if (this == ANY) return o;
+		if (o == ANY) return this;
 		if (!this.valid || !o.valid) return INVALID;
 		if (m_versA.isBranch != o.m_versA.isBranch) return INVALID;
 		if (m_versB.isBranch != o.m_versB.isBranch) return INVALID;

diff --git a/test/path-subpackage-ref/dub.json b/test/path-subpackage-ref/dub.json
@@ -1,7 +1,7 @@
 {
     "name": "test",
     "dependencies": {
-        "test:subpack": "~master"
+        "test:subpack": "*"
     },
     "subPackages": [
     	"subpack/"

diff --git a/test/subpackage-ref/dub.json b/test/subpackage-ref/dub.json
@@ -1,7 +1,7 @@
 {
     "name": "test",
     "dependencies": {
-        "test:subpack": "~master"
+        "test:subpack": "*"
     },
     "subPackages": [
         {