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

Merge pull request #2322 from coolo/fix_unselect

Browse Source 
Fix for unselect with message: need to ignore afterwards
This commit is contained in:
Stephan Kulow 2019-11-19 20:42:17 +01:00 committed by GitHub
commit 996128e856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc-staging.py
View File

@ -436,10 +436,7 @@ def do_staging(self, subcmd, opts, *args):
if api.item_exists(api.crebuild):
cmd.sync_buildfailures()
elif cmd == 'unselect':
if opts.message:
print('Ignoring requests first')
IgnoreCommand(api).perform(args[1:], opts.message)
UnselectCommand(api).perform(args[1:], opts.cleanup)
UnselectCommand(api).perform(args[1:], opts.cleanup, opts.message)
elif cmd == 'select':
# Include list of all stagings in short-hand and by full name.
existing_stagings = api.get_staging_projects_short(None)

10
osclib/unselect_command.py
View File

@ -1,5 +1,6 @@
from osc import conf
from osc.core import get_request
from osclib.comments import CommentAPI
from osclib.request_finder import RequestFinder
class UnselectCommand(object):
@ -8,6 +9,7 @@ class UnselectCommand(object):
def __init__(self, api):
self.api = api
self.config_init(api)
self.comment = CommentAPI(self.api.apiurl)
@classmethod
def config_init(cls, api):
@ -33,7 +35,7 @@ class UnselectCommand(object):
return False
def perform(self, packages, cleanup=False):
def perform(self, packages, cleanup, message):
"""
Remove request from staging project
:param packages: packages/requests to delete from staging projects
@ -45,7 +47,6 @@ class UnselectCommand(object):
print('Cleanup {} obsolete requests'.format(len(obsolete)))
packages += tuple(obsolete)
ignored_requests = self.api.get_ignored_requests()
affected_projects = set()
for request, request_project in RequestFinder.find_staged_sr(packages,
self.api).items():
@ -55,7 +56,10 @@ class UnselectCommand(object):
self.api.rm_from_prj(staging_project, request_id=request, msg='Removing from {}, re-evaluation needed'.format(staging_project))
req = get_request(self.api.apiurl, str(request))
if req.state.name in ('new', 'review') and request not in ignored_requests:
if message:
self.api.add_ignored_request(request, message)
self.comment.add_comment(request_id=str(request), comment=message)
elif req.state.name in ('new', 'review'):
print(' Consider marking the request ignored to let others know not to restage.')
# Notify everybody about the changes