Merge pull request #1416 from nilxam/not_complain_for_000pkg

Do not complain 000* package has defined in the two different ring
This commit is contained in:
Stephan Kulow 2018-02-22 11:54:51 +01:00 committed by GitHub
commit db87a62593
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -200,7 +200,7 @@ class StagingAPI(object):
# XXX TODO - Test-DVD-x86_64 is hardcoded here
if pkg in ret and not pkg.startswith('Test-DVD-'):
msg = '{} is defined in two projects ({} and {})'
if checklinks and pkg in except_pkgs and prj == except_pkgs[pkg]:
if pkg.startswith('000') or (checklinks and pkg in except_pkgs and prj == except_pkgs[pkg]):
msg = ''
if len(msg):
raise Exception(msg.format(pkg, ret[pkg], prj))