mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-06-04 06:11:38 +00:00
Merge change from Niels Thykier to fix --hint-tester
This commit is contained in:
parent
fc7696d26b
commit
ca4ed75019
14
britney.py
14
britney.py
@ -2984,7 +2984,7 @@ class Britney(object):
|
|||||||
while True:
|
while True:
|
||||||
# read the command from the command line
|
# read the command from the command line
|
||||||
try:
|
try:
|
||||||
input = raw_input('britney> ').lower().split()
|
user_input = input('britney> ').lower().split()
|
||||||
except EOFError:
|
except EOFError:
|
||||||
print("")
|
print("")
|
||||||
break
|
break
|
||||||
@ -2992,18 +2992,18 @@ class Britney(object):
|
|||||||
print("")
|
print("")
|
||||||
continue
|
continue
|
||||||
# quit the hint tester
|
# quit the hint tester
|
||||||
if input and input[0] in ('quit', 'exit'):
|
if user_input and user_input[0] in ('quit', 'exit'):
|
||||||
break
|
break
|
||||||
elif input and input[0] in ('remove', 'approve', 'urgent', 'age-days',
|
elif user_input and user_input[0] in ('remove', 'approve', 'urgent', 'age-days',
|
||||||
'block', 'block-udeb', 'unblock', 'unblock-udeb',
|
'block', 'block-udeb', 'unblock', 'unblock-udeb',
|
||||||
'block-all', 'force'):
|
'block-all', 'force'):
|
||||||
self.hints.add_hint(' '.join(input), 'hint-tester')
|
self.hints.add_hint(' '.join(user_input), 'hint-tester')
|
||||||
self.write_excuses()
|
self.write_excuses()
|
||||||
# run a hint
|
# run a hint
|
||||||
elif input and input[0] in ('easy', 'hint', 'force-hint'):
|
elif user_input and user_input[0] in ('easy', 'hint', 'force-hint'):
|
||||||
try:
|
try:
|
||||||
self.do_hint(input[0], 'hint-tester',
|
self.do_hint(user_input[0], 'hint-tester',
|
||||||
[k.rsplit("/", 1) for k in input[1:] if "/" in k])
|
[k.rsplit("/", 1) for k in user_input[1:] if "/" in k])
|
||||||
self.printuninstchange()
|
self.printuninstchange()
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
continue
|
continue
|
||||||
|
Loading…
x
Reference in New Issue
Block a user