Filter unwanted architectures out earlier

Deal with situations where packages with identical names for different
architectures exist in the same repository files. For instance package A
with `src` architecture and package `A` with `x86_64` architecture.

Signed-off-by: Roman Mohr <[email protected]>

Author: rmohr

pkg/reducer/reducer.go

@@ -36,14 +36,24 @@ func (r *RepoReducer) Load() error {
 		if err != nil {
 			return err
 		}
-		r.packages = append(r.packages, repoFile.Packages...)
+		for i, p := range repoFile.Packages {
+			if skip(p.Arch, r.architectures) {
+				continue
+			}
+			r.packages = append(r.packages, repoFile.Packages[i])
+		}
 	}
 	repos, err := r.cacheHelper.CurrentPrimaries(r.repos, r.arch)
 	if err != nil {
 		return err
 	}
 	for _, rpmrepo := range repos {
-		r.packages = append(r.packages, rpmrepo.Packages...)
+		for i, p := range rpmrepo.Packages {
+			if skip(p.Arch, r.architectures) {
+				continue
+			}
+			r.packages = append(r.packages, rpmrepo.Packages[i])
+		}
 	}
 
 	for i, p := range r.packages {
@@ -54,9 +64,6 @@ func (r *RepoReducer) Load() error {
 			}
 		}
 		r.packages[i].Format.Requires.Entries = requires
-		if skip(p.Arch, r.architectures) {
-			continue
-		}
 
 		for _, provides := range p.Format.Provides.Entries {
 			r.provides[provides.Name] = append(r.provides[provides.Name], &r.packages[i])

pkg/repo/fetch.go

@@ -53,10 +53,10 @@ func (r *RepoFetcherImpl) Fetch() (err error) {
 			return fmt.Errorf("failed to fetch primary.xml for %s: %v", repo.Name, err)
 		}
 		/* not used right now, save some bandwidth
-			err = r.fetchFile(api.FilelistsFileType, &repo, repomd, mirror)
-			if err != nil {
-				return fmt.Errorf("failed to fetch filelists.xml for %s: %v", repo.Name, err)
-			}
+		err = r.fetchFile(api.FilelistsFileType, &repo, repomd, mirror)
+		if err != nil {
+			return fmt.Errorf("failed to fetch filelists.xml for %s: %v", repo.Name, err)
+		}
 		*/
 	}
 	return nil