Merge pull request #1120 from jberry-suse/request_splitter-devel-fallback

osclib/request_splitter: for SLE, fallback to openSUSE:Factory devel projects.
This commit is contained in:
Stephan Kulow 2017-09-02 08:25:12 +02:00 committed by GitHub
commit bedca4c08d
2 changed files with 8 additions and 2 deletions

View File

@ -10,6 +10,7 @@ class ListCommand:
'SUSE:SLE-12-',
'openSUSE:Leap:'
'openSUSE:',
'openSUSE.org:',
'home:',
]
@ -36,8 +37,7 @@ class ListCommand:
splitter.group_by('./action/target/@devel_project')
splitter.split()
hide_source = (self.api.project == 'openSUSE:Factory' or
self.api.project.startswith('SUSE:SLE'))
hide_source = self.api.project == 'openSUSE:Factory'
for group in sorted(splitter.grouped.keys()):
print Fore.YELLOW + group

View File

@ -146,6 +146,12 @@ class RequestSplitter(object):
devel = self.api.get_devel_project(target_project, target_package)
if devel is None and self.api.project.startswith('openSUSE:'):
devel = self.api.get_devel_project('openSUSE:Factory', target_package)
if devel is None and self.api.project.startswith('SUSE:'):
# For SLE, fallback to openSUSE:Factory devel projects.
devel = self.api.get_devel_project('openSUSE.org:openSUSE:Factory', target_package)
if devel:
# Strip openSUSE.org: prefix since string since not used for lookup.
devel = devel.split(':', 1)[1]
return devel
def filter_check(self, request):