From 3452aadd81dae627f4321aa40db9d6c14466ef16 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 26 Sep 2013 22:24:37 -0700 Subject: [PATCH] ceph_argparse.py: clean up error reporting when required param missing Treat "need 1, got 0" as a special case, and change the message to "missing required parameter ". Also, when failing for that reason, print the command concise description and its helptext. Fixes: #6384 Signed-off-by: Dan Mick --- src/pybind/ceph_argparse.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py index 7ec7b8b2f0cfd..1f6e90b6c1d69 100644 --- a/src/pybind/ceph_argparse.py +++ b/src/pybind/ceph_argparse.py @@ -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 -- 2.39.5