From 8feb347022116991f6b5165a81affbe94b1b35b4 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Thu, 11 May 2017 22:50:00 -0500 Subject: [PATCH] osc-check_repo: protect staging project checks with arch conditions. --- osc-check_repo.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/osc-check_repo.py b/osc-check_repo.py index c4bb1c96..a8d14e0f 100644 --- a/osc-check_repo.py +++ b/osc-check_repo.py @@ -86,7 +86,9 @@ def _check_repo_download(self, request): return set() staging_prefix = '{}:'.format(self.checkrepo.staging.cstaging) - if staging_prefix in str(request.group): + if (str(request.group).startswith(staging_prefix) and + arch in self.checkrepo.target_archs(request.group) + ): pkglist = self.checkrepo.get_package_list_from_repository( request.group, 'standard', arch, request.src_package) @@ -99,17 +101,21 @@ def _check_repo_download(self, request): toignore.update(fn[1] for fn in pkglist) - pkglist = self.checkrepo.get_package_list_from_repository( - request.group + ':DVD', 'standard', - 'x86_64', request.src_package) - todownload = [ToDownload(request.group + ':DVD', 'standard', - 'x86_64', fn[0], fn[3]) for fn in pkglist] + project_dvd = request.group + ':DVD' + if (not self.checkrepo.staging.is_adi_project(request.group) and + self.checkrepo.staging.crings and + arch in self.checkrepo.target_archs(project_dvd) + ): + pkglist = self.checkrepo.get_package_list_from_repository( + project_dvd, 'standard', arch, request.src_package) + todownload = [ToDownload(project_dvd, 'standard', arch, fn[0], + fn[3]) for fn in pkglist] - toignore.update(fn[1] for fn in pkglist) + toignore.update(fn[1] for fn in pkglist) - self.checkrepo._download(request, todownload) - if request.error: - return set() + self.checkrepo._download(request, todownload) + if request.error: + return set() # Update toignore with the names of the source project (here in # this method) and with the names of the target project (_toignore