From fb446068a944f5f769d14543f7eaaef3c907e97a Mon Sep 17 00:00:00 2001 From: Tayler Geiger Date: Tue, 28 May 2024 09:50:11 -0500 Subject: [PATCH] Fix bugs - fix issue listing multilib repos - fix issue with duplicate detection breaking when repo contains name of another repo --- internal/app/copr-repo.go | 2 +- internal/app/util.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/app/copr-repo.go b/internal/app/copr-repo.go index ce7958b..d15f08c 100644 --- a/internal/app/copr-repo.go +++ b/internal/app/copr-repo.go @@ -84,7 +84,7 @@ func (c *CoprRepo) FindLocalFiles(fs afero.Fs) error { return err } for _, file := range files { - result, err := afero.FileContainsBytes(fs, ReposDir+file.Name(), []byte(c.Name())) + result, err := afero.FileContainsBytes(fs, ReposDir+file.Name(), []byte("/"+c.Name()+"/")) if err != nil { return err } diff --git a/internal/app/util.go b/internal/app/util.go index 40c4ad8..ec8a443 100644 --- a/internal/app/util.go +++ b/internal/app/util.go @@ -148,6 +148,8 @@ func GetReposList(fs afero.Fs, out io.Writer, state RepoState) ([]*CoprRepo, err // If we see our desired state, flip our flag if strings.Contains(scanner.Text(), string(state)) && isCoprRepo { addToResult = true + // Break once we have a result from the first config block + break } } if addToResult && !slices.Contains(reposStrings, repoName) {