summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Gaston <jeffrygaston@google.com> 2018-03-29 14:59:01 -0400
committer Jeff Gaston <jeffrygaston@google.com> 2018-03-29 17:44:36 -0400
commitaf2191e2016fa2bcff8986f1884b053080bc9071 (patch)
tree6a2a532ac092ab6a47d2adc8825d271c7622ec41
parent8f0848295790d5f7aec7164e35c246df72747fb8 (diff)
Have pom2mk list all duplicates modules
For easier debugging if there are multiple duplicates Bug: 76692459 Test: ./update_current.py -x <build-id> Change-Id: I3079cb4ed1cfd365d792a7b41c9cdb4e7a1e148f
-rw-r--r--cmd/pom2mk/pom2mk.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go
index 5842f7063..b4659f77f 100644
--- a/cmd/pom2mk/pom2mk.go
+++ b/cmd/pom2mk/pom2mk.go
@@ -360,6 +360,7 @@ The makefile is written to stdout, to be put in the current directory (often as
poms := []*Pom{}
modules := make(map[string]*Pom)
+ duplicate := false
for _, filename := range filenames {
pom, err := parse(filename)
if err != nil {
@@ -373,11 +374,15 @@ The makefile is written to stdout, to be put in the current directory (often as
if old, ok := modules[key]; ok {
fmt.Fprintln(os.Stderr, "Module", key, "defined twice:", old.PomFile, pom.PomFile)
+ duplicate = true
}
modules[key] = pom
}
}
+ if duplicate {
+ os.Exit(1)
+ }
for _, pom := range poms {
pom.FixDeps(modules)