Merge "Add useful error on invalid --os-image-api-version"

2014-12-02 01:43:35 +00:00
parent 3b6754a8cc d5a0e657ed
commit acb1659357
1 changed files with 7 additions and 1 deletions
@@ -285,7 +285,13 @@ class OpenStackImagesShell(object):

        self.subcommands = {}
        subparsers = parser.add_subparsers(metavar='<subcommand>')
-        submodule = utils.import_versioned_module(version, 'shell')
+        try:
+            submodule = utils.import_versioned_module(version, 'shell')
+        except ImportError:
+            print('"%s" is not a supported API version. Example '
+                  'values are "1" or "2".' % version)
+            utils.exit()
+
        self._find_actions(subparsers, submodule)
        self._find_actions(subparsers, self)