mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-27 04:32:18 +01:00
Code

Merge branch 'do_not_decode_diff_osc_rq_show' of https://github.com/lethliel/osc

Browse Source 
Do not decode the request_diff (osc rq show -d <reqid>).
This commit is contained in:
Marcus Huewe 2019-09-18 16:03:39 +02:00
commit 25687fb84b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc/commandline.py
View File

@ -1331,6 +1331,10 @@ class Osc(cmdln.Cmdln):
p = findpacs(os.curdir)[0] p = findpacs(os.curdir)[0]
src_project = p.prjname src_project = p.prjname
src_package = p.name src_package = p.name
if self.options.apiurl and self.options.apiurl != p.apiurl:
print('The apiurl for the working copy of this package is %s' % p.apiurl)
print('You cannot use this command with the -A %s option.' % self.options.apiurl)
sys.exit(1)
apiurl = p.apiurl apiurl = p.apiurl
if len(args) == 0 and p.islink(): if len(args) == 0 and p.islink():
dst_project = p.linkinfo.project dst_project = p.linkinfo.project
@ -2506,7 +2510,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
action.tgt_project.encode(), action.tgt_package.encode()) action.tgt_project.encode(), action.tgt_package.encode())
diff += submit_action_diff(apiurl, action) diff += submit_action_diff(apiurl, action)
diff += b'\n\n' diff += b'\n\n'
run_pager(decode_it(diff), tmp_suffix='') run_pager(diff, tmp_suffix='')
# checkout # checkout
elif cmd == 'checkout' or cmd == 'co': elif cmd == 'checkout' or cmd == 'co':