mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

- fix crash regression 'issue#124'

Browse Source
This commit is contained in:
Adrian Schröter 2014-11-12 14:40:24 +01:00
parent de702bb8ed
commit 87021e41fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc/core.py
View File

@ -3838,9 +3838,9 @@ def edit_message(footer='', template='', templatelen=30):
if lines[templatelen:]:
footer = '%s\n\n%s' % ('\n'.join(lines[templatelen:]), footer)
data += '\n' + delim + '\n' + footer
edit_text(data, delim, suffix='.diff')
edit_text(data, delim, suffix='.diff', template=template)
def edit_text(data='', delim=None, suffix='.txt'):
def edit_text(data='', delim=None, suffix='.txt', template=''):
import tempfile
try:
(fd, filename) = tempfile.mkstemp(prefix='osc-editor', suffix=suffix)
@ -3855,7 +3855,7 @@ def edit_text(data='', delim=None, suffix='.txt'):
break
else:
reason = 'Log message not specified'
if template and template == msg:
if template == msg:
reason = 'Default log message was not changed. Press \'c\' to continue.'
ri = raw_input('%s\na)bort, c)ontinue, e)dit: ' % reason)
if ri in 'aA':