fail gracefully when region unknown - fixes boto#1983

Author: ralfharing

bin/glacier

@@ -84,10 +84,14 @@ glacier <command> [args]
 
 def connect(region, debug_level=0, access_key=None, secret_key=None):
     """ Connect to a specific region """
-    return connect_to_region(region,
-                             aws_access_key_id=access_key, 
-                             aws_secret_access_key=secret_key,
-                             debug=debug_level)
+    layer2 = connect_to_region(region,
+                               aws_access_key_id=access_key,
+                               aws_secret_access_key=secret_key,
+                               debug=debug_level)
+    if layer2 is None:
+        print 'Invalid region (%s)' % region
+        sys.exit(1)
+    return layer2
 
 
 def list_vaults(region, access_key=None, secret_key=None):

boto/exception.py

@@ -517,11 +517,4 @@ def __repr__(self):
         return 'PleaseRetryException("%s", %s)' % (
             self.message,
             self.response
-        )
-
-class InvalidRegionError(Exception):
-    """Exception raised when region is invalid."""
-
-    def __init__(self, message):
-        super(InvalidRegionError, self).__init__(message)
-        self.message = message
+        )

boto/glacier/__init__.py

@@ -22,7 +22,6 @@
 #
 
 from boto.ec2.regioninfo import RegionInfo
-from boto.exception import InvalidRegionError
 
 
 def regions():
@@ -61,5 +60,4 @@ def connect_to_region(region_name, **kw_params):
     for region in regions():
         if region.name == region_name:
             return region.connect(**kw_params)
-    else:
-        raise InvalidRegionError('Invalid region (%s)' % region_name)
+    return None