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

Merge pull request #404 from openSUSE/adi_move

Browse Source 
support --move in adi - create a new adi for the given arguments
This commit is contained in:
Stephan Kulow 2015-08-25 11:31:10 +02:00
commit fd89446e0d
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc-staging.py
View File

@ -172,4 +172,4 @@ def do_staging(self, subcmd, opts, *args):
elif cmd == 'list': elif cmd == 'list':
ListCommand(api).perform() ListCommand(api).perform()
elif cmd == 'adi': elif cmd == 'adi':
AdiCommand(api).perform(args[1:]) AdiCommand(api).perform(args[1:], opts.move)

18
osclib/adi_command.py
View File

@ -56,7 +56,6 @@ class AdiCommand:
# we care only about first action # we care only about first action
action = action[0] action = action[0]
# Where are we targeting the package # Where are we targeting the package
if len(wanted_requests): if len(wanted_requests):
source_project = 'wanted' source_project = 'wanted'
@ -90,15 +89,24 @@ class AdiCommand:
# Notify everybody about the changes # Notify everybody about the changes
self.api.update_status_comments(name, 'select') self.api.update_status_comments(name, 'select')
def perform(self, packages): def perform(self, packages, move=False):
""" """
Perform the list command Perform the list command
""" """
if len(packages): if len(packages):
requests = set() requests = set()
for request, request_project in RequestFinder.find_sr(packages, if move:
self.api).items(): items = RequestFinder.find_staged_sr(packages, self.api).items()
print items
for request, request_project in items:
staging_project = request_project['staging']
self.api.rm_from_prj(staging_project, request_id=request)
self.api.add_review(request, by_group=self.api.cstaging_group, msg='Please recheck')
else:
items = RequestFinder.find_sr(packages, self.api).items()
for request, request_project in items:
requests.add(request) requests.add(request)
self.create_new_adi(requests) self.create_new_adi(requests)
else: else: