mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-24 17:16:12 +01:00
Code

- allow diffing of maintenance requests

Browse Source
This commit is contained in:
Adrian Schröter 2015-06-11 11:05:08 +02:00
parent e052839027
commit caef99c3d9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc/commandline.py
View File

@ -2236,8 +2236,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
except HTTPError as e: except HTTPError as e:
# for OBS 2.0 and before # for OBS 2.0 and before
sr_actions = r.get_actions('submit') sr_actions = r.get_actions('submit')
if not sr_actions: if not r.get_actions('submit') and not r.get_actions('maintenance_incident') and not r.get_actions('maintenance_release'):
raise oscerr.WrongOptions('\'--diff\' not possible (request has no \'submit\' actions)') raise oscerr.WrongOptions('\'--diff\' not possible (request has no supported actions)')
for action in sr_actions: for action in sr_actions:
diff += 'old: %s/%s\nnew: %s/%s\n' % (action.src_project, action.src_package, diff += 'old: %s/%s\nnew: %s/%s\n' % (action.src_project, action.src_package,
action.tgt_project, action.tgt_package) action.tgt_project, action.tgt_package)

2
osc/core.py
View File

@ -407,7 +407,7 @@ class Serviceinfo:
raise oscerr.PackageNotInstalled("obs-service-%s"%cmd[0]) raise oscerr.PackageNotInstalled("obs-service-%s"%cmd[0])
cmd[0] = "/usr/lib/obs/service/"+cmd[0] cmd[0] = "/usr/lib/obs/service/"+cmd[0]
cmd = cmd + [ "--outdir", temp_dir ] cmd = cmd + [ "--outdir", temp_dir ]
if conf.config['verbose'] > 1 or verbose: if conf.config['verbose'] > 1 or verbose or conf.config['debug']:
print("Run source service:", ' '.join(cmd)) print("Run source service:", ' '.join(cmd))
r = run_external(*cmd) r = run_external(*cmd)