Merge pull request #711 from mikijov/better-manifest-errors

Added check for multiple overrides in manifest files.
golang · Jun 17, 2017 · dfc77a0 · dfc77a0
2 parents a42708e + 319d04e
commit dfc77a0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/manifest.go b/manifest.go
@@ -193,6 +193,9 @@ func fromRawManifest(raw rawManifest) (*Manifest, error) {
 		if err != nil {
 			return nil, err
 		}
+		if _, exists := m.Ovr[name]; exists {
+			return nil, errors.Errorf("multiple overrides specified for %s, can only specify one", name)
+		}
 		m.Ovr[name] = prj
 	}
 

diff --git a/manifest_test.go b/manifest_test.go
@@ -107,6 +107,7 @@ func TestReadManifestErrors(t *testing.T) {
 	}{
 		{"multiple constraints", "manifest/error1.toml"},
 		{"multiple dependencies", "manifest/error2.toml"},
+		{"multiple overrides", "manifest/error3.toml"},
 	}
 
 	for _, tst := range tests {

diff --git a/testdata/manifest/error3.toml b/testdata/manifest/error3.toml
@@ -0,0 +1,9 @@
+ignored = ["github.com/foo/bar"]
+
+[[override]]
+  name = "github.com/golang/dep"
+  branch = "master"
+
+[[override]]
+  name = "github.com/golang/dep"
+  branch = "master"