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

request_splitter: replace incorrect devel project lookup copied from adi.

Browse Source 
Instead of checking action/source the action/target should be used.
This commit is contained in:
Jimmy Berry 2017-01-31 18:24:04 -06:00
parent 094dee529d
commit 550ab59e4e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osclib/request_splitter.py
View File

@ -67,7 +67,8 @@ class RequestSplitter(object):
def suppliment(self, request, target_package): def suppliment(self, request, target_package):
""" Provide additional information for grouping """ """ Provide additional information for grouping """
devel = self.devel_project_get(request, target_package) target_project = request.find('./action/target').get('project')
devel = self.devel_project_get(target_project, target_package)
if devel: if devel:
request.find('./action/source').set('devel_project', devel) request.find('./action/source').set('devel_project', devel)
@ -89,12 +90,10 @@ class RequestSplitter(object):
return ring[len(self.api.crings)+1:] return ring[len(self.api.crings)+1:]
return None return None
def devel_project_get(self, request, target_project): def devel_project_get(self, target_project, target_package):
# Preserve logic from adi and note that not Leap development friendly. devel = self.api.get_devel_project(target_project, target_package)
source = request.find('./action/source')
devel = self.api.get_devel_project(source.get('project'), source.get('package'))
if devel is None and self.api.project.startswith('openSUSE:'): if devel is None and self.api.project.startswith('openSUSE:'):
devel = self.api.get_devel_project('openSUSE:Factory', target_project) devel = self.api.get_devel_project('openSUSE:Factory', target_package)
return devel return devel
def filter_check(self, request): def filter_check(self, request):