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

No longer build disable on selecting non-ring packages to letter prjs

Browse Source 
This is no longer needed as we only have one subproject per staging
This commit is contained in:
Stephan Kulow 2018-11-08 17:28:18 +01:00
parent 4293b6bce1
commit 7a3b86fed1
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osclib/stagingapi.py
View File

@ -1178,13 +1178,11 @@ class StagingAPI(object):
return tar_pkg
def submit_to_prj(self, act, project, force_enable_build=False):
def submit_to_prj(self, act, project):
"""
Links sources from request to project
:param act: action for submit request
:param project: project to link into
:param force_enable_build: overwrite the ring criteria to enable
or disable the build
"""
src_prj = act.src_project
@ -1192,21 +1190,7 @@ class StagingAPI(object):
src_pkg = act.src_package
tar_pkg = act.tgt_package
disable_build = False
# The force_enable_build will avoid the
# map_ring_package_to_subproject
if not force_enable_build:
if self.crings and not self.ring_packages.get(tar_pkg) and not self.is_adi_project(project):
disable_build = True
logging.warning("{}/{} not in ring, build disabled".format(project, tar_pkg))
else:
project = self.map_ring_package_to_subject(project, tar_pkg)
if self._supersede:
disable_build = self._package_disabled.get('/'.join([project, tar_pkg]), disable_build)
self.create_package_container(project, tar_pkg,
disable_build=disable_build)
self.create_package_container(project, tar_pkg)
# expand the revision to a md5
url = self.makeurl(['source', src_prj, src_pkg],