Die with usage on inv cmd

diff --git a/libremanage.py b/libremanage.py
index 22d1c11703377afd603e21060f3860b20dd96985..6ebf835282569f8c0d5eb3f251a393d8c3dad628 100644 (file)
--- a/libremanage.py
+++ b/libremanage.py
@@ -36,11 +36,14 @@ Valid commands are as follows:
     - shutdown, reboot, poweron: Power management
 """
 
-if len(sys.argv) != 3:
-    print("Incorrect number of arguments")
+def die_with_usage(message):
+    print(message)
     print(USAGE)
     sys.exit(1)
 
+if len(sys.argv) != 3:
+    die_with_usage("Incorrect number of arguments")
+
 def get_server_handle(name):
     # TODO: resolve based on config, SSH in, give self-contained handle?
     return name
@@ -57,6 +60,10 @@ COMMANDS = {
 def issue_command(server_name, command):
     server = get_server_handle(server_name)
     print(server_name, command)
-    COMMANDS[command](server_name)
+
+    try:
+        COMMANDS[command](server_name)
+    except KeyError:
+        die_with_usage("Invalid command supplied")
 
 issue_command(sys.argv[1], sys.argv[2])