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

accept other new requests after accepting staging prjs

Browse Source
This commit is contained in:
Stephan Kulow 2014-06-01 19:51:18 +02:00
parent 25f55609d4
commit 454828d252
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osc-staging.py
View File

@ -80,7 +80,7 @@ def do_staging(self, subcmd, opts, *args):
raise oscerr.WrongArgs('No command given, see "osc help staging"!') raise oscerr.WrongArgs('No command given, see "osc help staging"!')
cmd = args[0] cmd = args[0]
if cmd in ('accept', 'freeze'): if cmd in ('accept', 'freeze'):
min_args, max_args = 1, 1 min_args, max_args = 1, None
elif cmd == 'check': elif cmd == 'check':
min_args, max_args = 0, 2 min_args, max_args = 0, 2
elif cmd == 'select': elif cmd == 'select':
@ -111,7 +111,10 @@ def do_staging(self, subcmd, opts, *args):
for prj in args[1:]: for prj in args[1:]:
FreezeCommand(api).perform(api.prj_from_letter(prj)) FreezeCommand(api).perform(api.prj_from_letter(prj))
elif cmd == 'accept': elif cmd == 'accept':
AcceptCommand(api).perform(api.prj_from_letter(args[1])) cmd = AcceptCommand(api)
for prj in args[1:]:
cmd.perform(api.prj_from_letter(prj))
cmd.accept_other_new()
elif cmd == 'unselect': elif cmd == 'unselect':
UnselectCommand(api).perform(args[1:]) UnselectCommand(api).perform(args[1:])
elif cmd == 'select': elif cmd == 'select':

25
osclib/accept_command.py
View File

@ -1,21 +1,37 @@
from osc.core import change_request_state from osc.core import change_request_state
from osc.core import get_request from osc.core import get_request
from osc.core import http_GET
from osclib.comments import CommentAPI from osclib.comments import CommentAPI
from xml.etree import cElementTree as ET
class AcceptCommand(object): class AcceptCommand(object):
def __init__(self, api): def __init__(self, api):
self.api = api self.api = api
self.comment = CommentAPI(self.api.apiurl) self.comment = CommentAPI(self.api.apiurl)
def find_new_requests(self, project):
requests = []
query = "match=state/@name='new'+and+(action/target/@project='{}'+and+action/@type='submit')".format(project)
url = self.api.makeurl(['search', 'request'], query)
f = http_GET(url)
root = ET.parse(f).getroot()
ids=[]
for rq in root.findall('request'):
ids.append(int(rq.get('id')))
return ids
def perform(self, project): def perform(self, project):
""" """
Accept the staging LETTER for review and submit to factory Accept the staging LETTER for review and submit to factory
Then disable the build to disabled Then disable the build to disabled
:param project: staging project we are working with :param project: staging project we are working with
""" """
status = self.api.check_project_status(project) status = self.api.check_project_status(project)
if not status: if not status:
@ -45,3 +61,10 @@ class AcceptCommand(object):
if self.api.project_exists(project + ":DVD"): if self.api.project_exists(project + ":DVD"):
self.api.build_switch_prj(project + ":DVD", 'disable') self.api.build_switch_prj(project + ":DVD", 'disable')
return True
def accept_other_new(self):
for req in self.find_new_requests('openSUSE:Factory'):
change_request_state(self.api.apiurl, str(req), 'accepted', message='Accept to factory')
return True