From af2191e2016fa2bcff8986f1884b053080bc9071 Mon Sep 17 00:00:00 2001 From: Jeff Gaston Date: Thu, 29 Mar 2018 14:59:01 -0400 Subject: [PATCH] Have pom2mk list all duplicates modules For easier debugging if there are multiple duplicates Bug: 76692459 Test: ./update_current.py -x Change-Id: I3079cb4ed1cfd365d792a7b41c9cdb4e7a1e148f --- cmd/pom2mk/pom2mk.go | 5 +++++ 1 file changed, 5 insertions(+) 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)