[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit c3055a0c80a65006d13da0506de907992837ee8e
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Feb 16 16:40:05 2013 -0800

    Fix bad parsers for shell-ish HMAC key sources

diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 9e39910..ad19ad7 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -75,15 +75,15 @@ class EC2CompatibleQuerySigV2Auth(QuerySigV2Auth):
         # Deprecated; should be removed in 3.2
         if os.path.isfile(self.args['shell_configfile']):
             config = _parse_shell_configfile(self.args['shell_configfile'])
-            if 'EC2_ACCESS_KEY' in config:
-                self.args.setdefault('key_id', config['EC2_ACCESS_KEY'])
-            if 'EC2_SECRET_KEY' in config:
-                self.args.setdefault('secret_key', config['EC2_SECRET_KEY'])
+            if 'EC2_ACCESS_KEY' in config and not self.args.get('key_id'):
+                self.args['key_id'] = config['EC2_ACCESS_KEY']
+            if 'EC2_SECRET_KEY' in config and not self.args.get('secret_key'):
+                self.args['secret_key'] = config['EC2_SECRET_KEY']
         # Environment (for compatibility with EC2 tools)
-        if 'EC2_ACCESS_KEY' in os.environ:
-            self.args.setdefault('key_id', os.getenv('EC2_ACCESS_KEY'))
-        if 'EC2_SECRET_KEY' in os.environ:
-            self.args.setdefault('secret_key', os.getenv('EC2_SECRET_KEY'))
+        if 'EC2_ACCESS_KEY' in os.environ and not self.args.get('key_id'):
+            self.args['key_id'] = os.getenv('EC2_ACCESS_KEY')
+        if 'EC2_SECRET_KEY' in os.environ and not self.args.get('secret_key'):
+            self.args['secret_key'] = os.getenv('EC2_SECRET_KEY')
         # AWS credential file (location given in the environment)
         self.configure_from_aws_credential_file()
         # Regular config file
@@ -95,10 +95,12 @@ class EC2CompatibleQuerySigV2Auth(QuerySigV2Auth):
             configfile_name = os.path.expanduser(configfile_name)
             if os.path.isfile(configfile_name):
                 config = _parse_shell_configfile(configfile_name)
-                if 'EC2_ACCESS_KEY' in os.environ:
-                    sefl.args.setdefault('key_id', config['EC2_ACCESS_KEY'])
-                if 'EC2_SECRET_KEY' in config:
-                    self.args.setdefault('secret_key', config['EC2_SECRET_KEY'])
+                if 'EC2_ACCESS_KEY' in config and not self.args.get('key_id'):
+                    self.args['key_id'] = config['EC2_ACCESS_KEY']
+                if ('EC2_SECRET_KEY' in config and
+                    not self.args.get('secret_key')):
+                    #
+                    self.args['secret_key'] = config['EC2_SECRET_KEY']
 
         # That's it; make sure we have everything we need
         if not self.args.get('key_id'):

-- 
managing cloud instances for Eucalyptus