yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osc-check_repo: protect staging project checks with arch conditions.

Browse Source
This commit is contained in:
Jimmy Berry 2017-05-11 22:50:00 -05:00
parent ab226e6007
commit 8feb347022
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osc-check_repo.py
View File

@ -86,7 +86,9 @@ def _check_repo_download(self, request):
return set() return set()
staging_prefix = '{}:'.format(self.checkrepo.staging.cstaging) 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( pkglist = self.checkrepo.get_package_list_from_repository(
request.group, 'standard', arch, request.group, 'standard', arch,
request.src_package) request.src_package)
@ -99,17 +101,21 @@ def _check_repo_download(self, request):
toignore.update(fn[1] for fn in pkglist) toignore.update(fn[1] for fn in pkglist)
pkglist = self.checkrepo.get_package_list_from_repository( project_dvd = request.group + ':DVD'
request.group + ':DVD', 'standard', if (not self.checkrepo.staging.is_adi_project(request.group) and
'x86_64', request.src_package) self.checkrepo.staging.crings and
todownload = [ToDownload(request.group + ':DVD', 'standard', arch in self.checkrepo.target_archs(project_dvd)
'x86_64', fn[0], fn[3]) for fn in pkglist] ):
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) self.checkrepo._download(request, todownload)
if request.error: if request.error:
return set() return set()
# Update toignore with the names of the source project (here in # Update toignore with the names of the source project (here in
# this method) and with the names of the target project (_toignore # this method) and with the names of the target project (_toignore