From 5dae4f3359c3121192ff7a2c4725726592780596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Sat, 12 Sep 2020 23:20:53 +0200 Subject: [PATCH] Warn when we'd submit duplicate-basename manifest --- gitsrht-update-hook/submitter.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gitsrht-update-hook/submitter.go b/gitsrht-update-hook/submitter.go index e50174c..5c96857 100644 --- a/gitsrht-update-hook/submitter.go +++ b/gitsrht-update-hook/submitter.go @@ -162,6 +162,12 @@ func (submitter GitBuildSubmitter) FindManifests() (map[string]string, error) { manifests := make(map[string]string) for _, file := range files { + basename := path.Base(file.Name) + if _, ok := manifests[basename]; ok { + log.Printf("Not submitting duplicate manifest %s [%s]\n", file.Name, basename) + continue + } + var ( reader io.Reader content []byte @@ -175,7 +181,7 @@ func (submitter GitBuildSubmitter) FindManifests() (map[string]string, error) { if !utf8.Valid(content) { return nil, errors.Wrap(err, "manifest is not valid UTF-8 file") } - manifests[path.Base(file.Name)] = string(content) + manifests[basename] = string(content) } return manifests, nil } -- 2.38.4