cli: Fix nonetype issue with cachemaker and exit after printing version

yadvr · yadvr · commit 4ad5d1a4f55a · 2013-03-20T12:42:29.000+05:30
Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/tools/cli/cloudmonkey/cachemaker.py b/tools/cli/cloudmonkey/cachemaker.py
@@ -100,7 +100,11 @@ def monkeycache(apis):
     cache['count'] = getvalue(apis[responsekey], 'count')
     cache['asyncapis'] = []
 
-    for api in getvalue(apis[responsekey], 'api'):
+    apilist = getvalue(apis[responsekey], 'api')
+    if apilist == None:
+        print "[monkeycache] Server response issue, no apis found"
+
+    for api in apilist:
         name = getvalue(api, 'name')
         verb, subject = splitverbsubject(name)
 
diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py
@@ -487,6 +487,7 @@ def main():
     if options.version:
         print "cloudmonkey", __version__
         print __description__, "(%s)" % __projecturl__
+        sys.exit(0)
 
     shell = CloudMonkeyShell(sys.argv[0], options.cfile)
     if len(args) > 1:
