From eeaee1c20f17c3ab5c32e1b518bcbde17ccde3cc Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Aug 06 2019 11:30:08 +0000
Subject: Add function to get all arches in a compose


The same logic is used in two places. This deserves a common function.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---

diff --git a/pungi/phases/pkgset/common.py b/pungi/phases/pkgset/common.py
index 2a4e939..8fd9696 100644
--- a/pungi/phases/pkgset/common.py
+++ b/pungi/phases/pkgset/common.py
@@ -138,3 +138,12 @@ def materialize_pkgset(compose, pkgset_global, path_prefix):
     create_arch_repos(compose, path_prefix)
 
     return package_sets
+
+
+def get_all_arches(compose):
+    all_arches = set(["src"])
+    for arch in compose.get_arches():
+        is_multilib = is_arch_multilib(compose.conf, arch)
+        arches = get_valid_arches(arch, is_multilib)
+        all_arches.update(arches)
+    return all_arches
diff --git a/pungi/phases/pkgset/sources/source_repos.py b/pungi/phases/pkgset/sources/source_repos.py
index 5dfbffe..5cb015f 100644
--- a/pungi/phases/pkgset/sources/source_repos.py
+++ b/pungi/phases/pkgset/sources/source_repos.py
@@ -20,11 +20,10 @@ from six.moves import cPickle as pickle
 from kobo.shortcuts import run
 
 import pungi.phases.pkgset.pkgsets
-from pungi.arch import get_valid_arches
-from pungi.util import makedirs, is_arch_multilib
+from pungi.util import makedirs
 from pungi.wrappers.pungi import PungiWrapper
 
-from pungi.phases.pkgset.common import materialize_pkgset
+from pungi.phases.pkgset.common import materialize_pkgset, get_all_arches
 from pungi.phases.gather import get_prepopulate_packages, get_packages_to_gather
 from pungi.linker import LinkerPool
 
@@ -119,11 +118,7 @@ def get_pkgset_from_repos(compose):
 
 
 def populate_global_pkgset(compose, file_list, path_prefix):
-    ALL_ARCHES = set(["src"])
-    for arch in compose.get_arches():
-        is_multilib = is_arch_multilib(compose.conf, arch)
-        arches = get_valid_arches(arch, is_multilib)
-        ALL_ARCHES.update(arches)
+    ALL_ARCHES = get_all_arches(compose)
 
     global_pkgset_path = os.path.join(compose.paths.work.topdir(arch="global"), "packages.pickle")