Skip to content

Commit

Permalink
featurens: fix detecting duplicated namespaces problem
Browse files Browse the repository at this point in the history
  • Loading branch information
KeyboardNerd committed Jun 22, 2017
1 parent f0e21df commit 50437f3
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions ext/featurens/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func RegisterDetector(name string, d Detector) {
func Detect(files tarutil.FilesMap) ([]database.Namespace, error) {
detectorsM.RLock()
defer detectorsM.RUnlock()
var namespaces []database.Namespace
namespaces := map[string]*database.Namespace{}
for name, detector := range detectors {
namespace, err := detector.Detect(files)
if err != nil {
Expand All @@ -82,11 +82,15 @@ func Detect(files tarutil.FilesMap) ([]database.Namespace, error) {

if namespace != nil {
log.WithFields(log.Fields{"name": name, "namespace": namespace.Name}).Debug("detected namespace")
namespaces = append(namespaces, *namespace)
namespaces[namespace.Name] = namespace
}
}

return namespaces, nil
nslist := []database.Namespace{}
for _, ns := range namespaces {
nslist = append(nslist, *ns)
}
return nslist, nil
}

// RequiredFilenames returns the total list of files required for all
Expand Down

0 comments on commit 50437f3

Please sign in to comment.