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

Submitting changes back implemented

Browse Source 
Staging plugin can now submit back any changes done in staging repo.
This commit is contained in:
Michal Hrusecky 2013-12-17 13:45:59 +01:00
parent 609bf8ae2d
commit 4cc07b2a2f
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osc-staging.py
View File

@ -7,6 +7,7 @@
from osc import cmdln from osc import cmdln
from osc import conf from osc import conf
from osc import commandline
OSC_STAGING_VERSION='0.0.1' OSC_STAGING_VERSION='0.0.1'
@ -46,7 +47,7 @@ def _get_changed(apiurl, project, everything):
p = linkinfo.get('package') p = linkinfo.get('package')
r = linkinfo.get('revision') r = linkinfo.get('revision')
if len(server_diff(apiurl, t, p, r, project, pkg, None, True)) > 0: if len(server_diff(apiurl, t, p, r, project, pkg, None, True)) > 0:
ret.append({'pkg': pkg, 'code': 'MODIFIED', 'msg': 'Has local modifications'}) ret.append({'pkg': pkg, 'code': 'MODIFIED', 'msg': 'Has local modifications', 'pprj': t, 'ppkg': p})
continue continue
return ret return ret
@ -307,7 +308,30 @@ def _staging_submit_devel(self, project, opts):
:param apiurl: pointer to obs api url link :param apiurl: pointer to obs api url link
:param project: staging project to submit into devel projects :param project: staging project to submit into devel projects
""" """
print("Not implemented.") apiurl = self.get_api_url()
chng = _get_changed(apiurl, project, True)
msg = "Fixes from staging project %s" % project
if opts.message != None:
msg = opts.message
if len(chng) > 0:
for pair in chng:
if pair['code'] != 'MODIFIED':
print >>sys.stderr, 'Error: Package "%s": %s'%(pair['pkg'],pair['msg'])
else:
print('Sending changes back %s/%s -> %s/%s'%(project,pair['pkg'],pair['pprj'],pair['ppkg']))
action_xml = '<request>';
action_xml += ' <action type="submit"> <source project="%s" package="%s" /> <target project="%s" package="%s" />' % (project, pair['pkg'], pair['pprj'], pair['ppkg'])
action_xml += ' </action>'
action_xml += ' <state name="new"/> <description>%s</description>' % msg
action_xml += '</request>'
u = makeurl(apiurl, ['request'], query='cmd=create&addrevision=1')
f = http_POST(u, data=action_xml)
root = ET.parse(f).getroot()
print("Created request %s" % (root.get('id')))
else:
print("No changes to submit")
return return
@ -315,6 +339,8 @@ def _staging_submit_devel(self, project, opts):
help='during check do not stop on first first issue and show them all') help='during check do not stop on first first issue and show them all')
@cmdln.option('-p', '--parent', metavar='TARGETPROJECT', @cmdln.option('-p', '--parent', metavar='TARGETPROJECT',
help='manually specify different parent project during creation of staging') help='manually specify different parent project during creation of staging')
@cmdln.option('-m', '--message', metavar='TEXT',
help='manually specify different parent project during creation of staging')
@cmdln.option('-v', '--version', action='store_true', @cmdln.option('-v', '--version', action='store_true',
dest='version', dest='version',
help='show version of the plugin') help='show version of the plugin')
@ -336,13 +362,13 @@ def do_staging(self, subcmd, opts, *args):
osc staging create [--parent project] SR# osc staging create [--parent project] SR#
osc staging create [--parent project] PROJECT[/PACKAGE] osc staging create [--parent project] PROJECT[/PACKAGE]
osc staging remove REPO osc staging remove REPO
osc stating submit-devel REPO osc stating submit-devel [-m message] REPO
""" """
if opts.version: if opts.version:
self._print_version() self._print_version()
# available commands # available commands
cmds = ['check', 'push', 'p', 'create', 'c', 'remove', 'r'] cmds = ['check', 'create', 'c', 'remove', 'r', 'submit-devel', 's']
if not args or args[0] not in cmds: if not args or args[0] not in cmds:
raise oscerr.WrongArgs('Unknown stagings action. Choose one of the %s.'%(', '.join(cmds))) raise oscerr.WrongArgs('Unknown stagings action. Choose one of the %s.'%(', '.join(cmds)))