RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 23:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph_argparse.py: clean up error reporting when required param missing

Browse Source 
Treat "need 1, got 0" as a special case, and change the message to
"missing required parameter <x>".  Also, when failing for that reason,
print the command concise description and its helptext.

Fixes: #6384
Signed-off-by: Dan Mick <dan.mick@inktank.com>
This commit is contained in:
Dan Mick 2013-09-26 22:24:37 -07:00
parent fac4a897f9
commit 3452aadd81
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pybind/ceph_argparse.py
View File

@ -843,6 +843,11 @@ def validate(args, signature, partial=False):
# wanted n, got too few
if partial:
return d
# special-case the "0 expected 1" case
if desc.numseen == 0 and desc.n == 1:
raise ArgumentNumber(
'missing required parameter {0}'.format(desc)
)
raise ArgumentNumber(
'saw {0} of {1}, expected {2}'.\
format(desc.numseen, desc, desc.n)
@ -951,6 +956,7 @@ def validate_command(sigdict, args, verbose=False):
# Stop now, because we have the right command but
# some other input is invalid
print >> sys.stderr, "Invalid command: ", str(e)
print >> sys.stderr, concise_sig(sig), ': ', cmd['help']
return {}
if found:
break