Merge pull request #3021 from Vogtinator/noi586comment

project-installcheck.py: Support arch-specific ignore-conflicts config
openSUSE · Oct 17, 2023 · c439ad7 · c439ad7
2 parents 864b176 + 5a7e59d
commit c439ad7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/project-installcheck.py b/project-installcheck.py
@@ -240,7 +240,8 @@ def check_pra(self, project, repository, arch):
 
         per_source = dict()
 
-        ignore_conflicts = Config.get(self.apiurl, project).get('installcheck-ignore-conflicts', '').split(' ')
+        ignore_conflicts = config.get('installcheck-ignore-conflicts', '').split() + \
+            config.get(f'installcheck-ignore-conflicts-{arch}', '').split()
 
         for package, entry in parsed.items():
             source = "{}/{}/{}/{}".format(project, repository, arch, entry['source'])