~edwargix/git.sr.ht

5dae4f3359c3121192ff7a2c4725726592780596 — наб 4 years ago 0c45d64
Warn when we'd submit duplicate-basename manifest
1 files changed, 7 insertions(+), 1 deletions(-)

M gitsrht-update-hook/submitter.go
M gitsrht-update-hook/submitter.go => gitsrht-update-hook/submitter.go +7 -1
@@ 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
}