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

Merge pull request #1183 from lnussel/staging

Browse Source 
staging: add exceptions for new 000* product files
This commit is contained in:
Ludwig Nussel 2017-10-10 13:27:48 +02:00 committed by GitHub
commit 02e50005b1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osclib/freeze_command.py
View File

@ -253,6 +253,8 @@ class FreezeCommand(object):
# If the package is an internal one (e.g _product)
if package.startswith('_'):
return None
if package.startswith('000'):
return None
# Ignore packages with an origing (i.e. with an origin
# different from the current project)

2
osclib/stagingapi.py
View File

@ -195,7 +195,7 @@ class StagingAPI(object):
for si in ET.parse(root).getroot().findall('sourceinfo'):
pkg = si.get('package')
# XXX TODO - Test-DVD-x86_64 is hardcoded here
if pkg in ret and not pkg.startswith('Test-DVD-'):
if pkg in ret and not pkg.startswith('Test-DVD-') and not pkg.startswith('000'):
msg = '{} is defined in two projects ({} and {})'
if checklinks and pkg in except_pkgs and prj == except_pkgs[pkg]:
msg = ''