]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph: tolerate commands without any child args
authorGreg Farnum <greg@inktank.com>
Thu, 24 Oct 2013 18:33:08 +0000 (11:33 -0700)
committerGreg Farnum <greg@inktank.com>
Thu, 24 Oct 2013 19:35:47 +0000 (12:35 -0700)
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
src/ceph.in

index 72c58541b0f0823749ba3f09c1aa1c6c607b82f9..57816d35b422cbdc29f2e30b5a97bdef2a64246f 100755 (executable)
@@ -616,13 +616,13 @@ def main():
         hdr('Monitor commands:')
         print '[Contacting monitor, timeout after %d seconds]' % timeout
 
-    if childargs[0] == 'ping':
+    if childargs and childargs[0] == 'ping':
         if len(childargs) < 2:
             print >> sys.stderr, '"ping" requires a monitor name as argument: "ping mon.<id>"'
             return 1
 
     try:
-        if childargs[0] == 'ping':
+        if childargs and childargs[0] == 'ping':
             return ping_monitor(cluster_handle, childargs[1])
         cluster_handle.connect(timeout=timeout)
     except KeyboardInterrupt: