mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-09 20:45:47 +01:00
Code

- request_interactive_review: print request again (after displaying the diff)

Browse Source
This commit is contained in:
Marcus Huewe 2010-08-31 14:15:04 +02:00
parent 1da96d7df7
commit 1fb6c3c48c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc/core.py
View File

@ -5197,6 +5197,7 @@ def request_interactive_review(apiurl, request):
tmpfile = None tmpfile = None
def print_request(request):
try: try:
# FIXME: print can fail with unicode chars in the string. # FIXME: print can fail with unicode chars in the string.
# Here we fix the symptoms, not the cause. # Here we fix the symptoms, not the cause.
@ -5204,7 +5205,7 @@ def request_interactive_review(apiurl, request):
print request print request
except: except:
print request.__str__().encode('ascii', 'xmlcharrefreplace') print request.__str__().encode('ascii', 'xmlcharrefreplace')
print_request(request)
try: try:
msg = '(a)ccept/(d)ecline/(r)evoke/(c)ancel > ' msg = '(a)ccept/(d)ecline/(r)evoke/(c)ancel > '
if request.actions[0].type == 'submit': if request.actions[0].type == 'submit':
@ -5242,6 +5243,7 @@ def request_interactive_review(apiurl, request):
tmpfile.write(diff) tmpfile.write(diff)
tmpfile.flush() tmpfile.flush()
run_editor(tmpfile.name) run_editor(tmpfile.name)
print_request(request)
elif repl == 'c': elif repl == 'c':
print >>sys.stderr, 'Aborting' print >>sys.stderr, 'Aborting'
raise oscerr.UserAbort() raise oscerr.UserAbort()