diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-23 18:57:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-23 18:57:35 +0000 |
| commit | ce3a4bb2685da87a58f545e4f882c3f8be3bd081 (patch) | |
| tree | aebb6caedd24d61811b20361a507790166c8defd | |
| parent | c86f03385e85e98a7ff2c8649a85e3ede33f2279 (diff) | |
| parent | 4447ff7d38a4df9525203d688a9ae9fc9ba72860 (diff) | |
| download | build_soong-ce3a4bb2685da87a58f545e4f882c3f8be3bd081.tar.gz build_soong-ce3a4bb2685da87a58f545e4f882c3f8be3bd081.tar.bz2 build_soong-ce3a4bb2685da87a58f545e4f882c3f8be3bd081.zip | |
Merge "Have pom2mk list all duplicates modules" into pi-dev
| -rw-r--r-- | cmd/pom2mk/pom2mk.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/pom2mk/pom2mk.go b/cmd/pom2mk/pom2mk.go index d45067fc..80941608 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) |