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

Improve grammar of request supersede message

Browse Source
This commit is contained in:
Stefan Knorr 2019-03-01 20:24:31 +01:00
parent 3266e43164
commit 84c8019383
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osc/core.py
View File

@ -4538,12 +4538,17 @@ def check_existing_requests(apiurl, src_project, src_package, dst_project,
return True, reqs return True, reqs
repl = '' repl = ''
if reqs: if reqs:
print('There are already the following submit request: %s.' % \ open_request_string = "The following submit request is already open:"
', '.join([i.reqid for i in reqs])) supersede_request_string = "Supersede the old request?"
repl = raw_input('Supersede the old requests? (y/n/c) ') if len(reqs) > 1:
open_request_string = "The following submit requests are already open:"
supersede_request_string = "Supersede the old requests?"
print('%s %s.' % \
(open_request_string, ', '.join([i.reqid for i in reqs])))
repl = raw_input('%s (y/n/c) ' % supersede_request_string)
while repl.lower() not in ['c', 'y', 'n']: while repl.lower() not in ['c', 'y', 'n']:
print('%s is not a valid option.' % repl) print('%s is not a valid option.' % repl)
repl = raw_input('Supersede the old requests? (y/n/c) ') repl = raw_input('%s (y/n/c) ' % supersede_request_string)
if repl.lower() == 'c': if repl.lower() == 'c':
print('Aborting', file=sys.stderr) print('Aborting', file=sys.stderr)
raise oscerr.UserAbort() raise oscerr.UserAbort()
@ -4561,12 +4566,17 @@ def check_existing_maintenance_requests(apiurl, src_project, src_packages, dst_p
return True, reqs return True, reqs
repl = '' repl = ''
if reqs: if reqs:
print('There are already the following maintenance incident request: %s.' % \ open_request_string = "The following maintenance incident request is already open:"
', '.join([i.reqid for i in reqs])) supersede_request_string = "Supersede the old request?"
repl = raw_input('Supersede the old requests? (y/n/c) ') if len(reqs) > 1:
open_request_string = "The following maintenance incident requests are already open:"
supersede_request_string = "Supersede the old requests?"
print('%s %s.' % \
(open_request_string, ', '.join([i.reqid for i in reqs])))
repl = raw_input('%s (y/n/c) ' % supersede_request_string)
while repl.lower() not in ['c', 'y', 'n']: while repl.lower() not in ['c', 'y', 'n']:
print('%s is not a valid option.' % repl) print('%s is not a valid option.' % repl)
repl = raw_input('Supersede the old requests? (y/n/c) ') repl = raw_input('%s (y/n/c) ' % supersede_request_string)
if repl.lower() == 'c': if repl.lower() == 'c':
print('Aborting', file=sys.stderr) print('Aborting', file=sys.stderr)
raise oscerr.UserAbort() raise oscerr.UserAbort()