Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
martin 2011-07-18 15:28:00 -04:00
commit a43d21a7a2

View file

@ -195,7 +195,7 @@ def StorageSetAction(option, opt, value, parser):
parser.rargs.remove('--force') parser.rargs.remove('--force')
if(not bypass): if(not bypass):
errorIfMultipleOption(parser.rargs, "Only [-f] and [--force] option is allowed with this option.") errorIfMultipleOption(parser.rargs, "Only [-f] and [--force] option is allowed with this option.")
possibleInput = {'y','Y','n','N'} possibleInput = ['y','Y','n','N']
confirm = raw_input("Are you sure you want to change the storage direcory? (y/N)") confirm = raw_input("Are you sure you want to change the storage direcory? (y/N)")
confirm = confirm or 'N' confirm = confirm or 'N'
while(confirm not in possibleInput): while(confirm not in possibleInput):