From: Greg Farnum <greg@inktank.com>
Date: Thu, 24 Oct 2013 18:33:08 +0000 (-0700)
Subject: ceph: tolerate commands without any child args
X-Git-Tag: v0.72-rc1~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d326c3fa59de6588c8024bb7ec60599a2a63778;p=ceph.git

ceph: tolerate commands without any child args

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index 72c58541b0f0..57816d35b422 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -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: