Merge pull request #51 from NamelessOne91/multi_arch_repo_support

Filter packages in multi-architecture repositories
uyuni-project · Oct 16, 2024 · fb47d41 · fb47d41
2 parents 9b2c4d4 + 596281e
commit fb47d41
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/cmd/sync.go b/cmd/sync.go
@@ -123,6 +123,11 @@ func syncersFromConfig(configString string) ([]*get.Syncer, error) {
 			return nil, err
 		}
 
+		archs := map[string]bool{}
+		for _, archString := range httpRepo.Archs {
+			archs[archString] = true
+		}
+
 		var storage get.Storage
 		switch config.Storage.Type {
 		case "file":
@@ -133,7 +138,7 @@ func syncersFromConfig(configString string) ([]*get.Syncer, error) {
 				return nil, err
 			}
 		}
-		syncers = append(syncers, get.NewSyncer(*repoURL, storage))
+		syncers = append(syncers, get.NewSyncer(*repoURL, archs, storage))
 	}
 
 	return syncers, nil

diff --git a/get/syncer.go b/get/syncer.go
@@ -108,6 +108,7 @@ var (
 type Syncer struct {
 	// URL of the repo this syncer syncs
 	URL     url.URL
+	archs   map[string]bool
 	storage Storage
 }
 
@@ -124,8 +125,8 @@ const (
 )
 
 // NewSyncer creates a new Syncer
-func NewSyncer(url url.URL, storage Storage) *Syncer {
-	return &Syncer{url, storage}
+func NewSyncer(url url.URL, archs map[string]bool, storage Storage) *Syncer {
+	return &Syncer{url, archs, storage}
 }
 
 // StoreRepo stores an HTTP repo in a Storage, automatically retrying in case of recoverable errors
@@ -418,18 +419,23 @@ func (r *Syncer) processPrimary(path string, checksumMap map[string]XMLChecksum,
 		return
 	}
 
+	allArchs := len(r.archs) == 0
 	for _, pack := range primary.Packages {
-		if SkipLegacy && (pack.Arch == "i586" || pack.Arch == "i686") {
+		legacyPackage := (pack.Arch == "i586" || pack.Arch == "i686")
+
+		if SkipLegacy && legacyPackage {
 			fmt.Println("Skipping legacy package:", pack.Location.Href)
 			continue
 		}
 
-		decision := r.decide(pack.Location.Href, pack.Checksum, checksumMap)
-		switch decision {
-		case Download:
-			packagesToDownload = append(packagesToDownload, pack)
-		case Recycle:
-			packagesToRecycle = append(packagesToRecycle, pack)
+		if allArchs || pack.Arch == repoType.Noarch || r.archs[pack.Arch] || (r.archs["x86_64"] && legacyPackage) {
+			decision := r.decide(pack.Location.Href, pack.Checksum, checksumMap)
+			switch decision {
+			case Download:
+				packagesToDownload = append(packagesToDownload, pack)
+			case Recycle:
+				packagesToRecycle = append(packagesToRecycle, pack)
+			}
 		}
 	}
 	return

diff --git a/get/syncer_test.go b/get/syncer_test.go
@@ -18,12 +18,15 @@ func TestStoreRepo(t *testing.T) {
 		t.Error(err)
 	}
 
+	archs := map[string]bool{
+		"x86_64": true,
+	}
 	storage := NewFileStorage(directory)
 	url, err := url.Parse("http://localhost:8080/repo")
 	if err != nil {
 		t.Error(err)
 	}
-	syncer := NewSyncer(*url, storage)
+	syncer := NewSyncer(*url, archs, storage)
 
 	// first sync
 	err = syncer.StoreRepo()
@@ -72,12 +75,15 @@ func TestStoreRepoZstd(t *testing.T) {
 		t.Error(err)
 	}
 
+	archs := map[string]bool{
+		"x86_64": true,
+	}
 	storage := NewFileStorage(directory)
 	url, err := url.Parse("http://localhost:8080/zstrepo")
 	if err != nil {
 		t.Error(err)
 	}
-	syncer := NewSyncer(*url, storage)
+	syncer := NewSyncer(*url, archs, storage)
 
 	// first sync
 	err = syncer.StoreRepo()
@@ -125,12 +131,16 @@ func TestStoreDebRepo(t *testing.T) {
 		t.Error(err)
 	}
 
+	archs := map[string]bool{
+		"amd64": true,
+	}
+
 	storage := NewFileStorage(directory)
 	url, err := url.Parse("http://localhost:8080/deb_repo")
 	if err != nil {
 		t.Error(err)
 	}
-	syncer := NewSyncer(*url, storage)
+	syncer := NewSyncer(*url, archs, storage)
 
 	// first sync
 	err = syncer.StoreRepo()