summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-03-28 16:27:33 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-03-28 16:27:33 -0700
commitf67b18b61297b4cb0d641695de01e52fd37ddd1c (patch)
tree6c1ab2cf1a9f90247b786ae8a3ed06b19f063702
parente025ede777b0ee6652e035dfde467037f0485de2 (diff)
downloadnova-f67b18b61297b4cb0d641695de01e52fd37ddd1c.tar.gz
nova-f67b18b61297b4cb0d641695de01e52fd37ddd1c.tar.xz
nova-f67b18b61297b4cb0d641695de01e52fd37ddd1c.zip
displays an error message if a command fails, so that the user knows something went wrong
-rwxr-xr-xbin/nova-manage11
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index cf0caf47e..f7308abe5 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1098,8 +1098,8 @@ def main():
script_name = argv.pop(0)
if len(argv) < 1:
print script_name + " category action [<args>]"
- print "Available categories:"
- for k, _ in CATEGORIES:
+ print _("Available categories:")
+ for k, _v in CATEGORIES:
print "\t%s" % k
sys.exit(2)
category = argv.pop(0)
@@ -1110,7 +1110,7 @@ def main():
actions = methods_of(command_object)
if len(argv) < 1:
print script_name + " category action [<args>]"
- print "Available actions for %s category:" % category
+ print _("Available actions for %s category:") % category
for k, _v in actions:
print "\t%s" % k
sys.exit(2)
@@ -1122,9 +1122,12 @@ def main():
fn(*argv)
sys.exit(0)
except TypeError:
- print "Possible wrong number of arguments supplied"
+ print _("Possible wrong number of arguments supplied")
print "%s %s: %s" % (category, action, fn.__doc__)
raise
+ except:
+ print _("Command failed, please check log for more info")
+ raise
if __name__ == '__main__':
main()