[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 4b8b665906852e3a613e6aa3c387ac39bd883528
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sun Feb 3 01:20:25 2013 -0800

    Rename ENV_URL -> URL_ENVVAR

diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index 233316e..433909f 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -38,7 +38,7 @@ class Euare(requestbuilder.service.BaseService):
     DESCRIPTION = 'Eucalyptus User, Authorization and Reporting Environment'
     API_VERSION = '2010-05-08'
     AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
-    ENV_URL = 'EUARE_URL'
+    URL_ENVVAR = 'EUARE_URL'
 
 class EuareRequest(Euca2oolsRequest):
     SERVICE_CLASS = Euare
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 6812f27..c99208d 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -110,7 +110,7 @@ class Eucalyptus(requestbuilder.service.BaseService):
     DESCRIPTION = 'Eucalyptus compute cloud service'
     API_VERSION = '2009-11-30'
     AUTH_CLASS  = EC2CompatibleQuerySigV2Auth
-    ENV_URL = 'EC2_URL'
+    URL_ENVVAR = 'EC2_URL'
 
     ARGS = [Arg('--config', dest='shell_configfile', metavar='CFGFILE',
                  default='', route_to=SERVICE, help=argparse.SUPPRESS),
@@ -130,11 +130,11 @@ class Eucalyptus(requestbuilder.service.BaseService):
         # Deprecated; should be removed in 3.2
         if os.path.isfile(self.args['shell_configfile']):
             config = _parse_shell_configfile(self.args['shell_configfile'])
-            self.process_url(config.get(self.ENV_URL))
-            if self.ENV_URL in config:
-                self.process_url(config[self.ENV_URL])
+            self.process_url(config.get(self.URL_ENVVAR))
+            if self.URL_ENVVAR in config:
+                self.process_url(config[self.URL_ENVVAR])
         # Environment
-        self.process_url(os.getenv(self.ENV_URL))
+        self.process_url(os.getenv(self.URL_ENVVAR))
         # Regular config file
         self.process_url(self.config.get_region_option(self.NAME + '-url'))
         # User, systemwide shell-style config files
@@ -144,8 +144,8 @@ class Eucalyptus(requestbuilder.service.BaseService):
             configfile_name = os.path.expanduser(configfile_name)
             if os.path.isfile(configfile_name):
                 config = _parse_shell_configfile(configfile_name)
-                if self.ENV_URL in config:
-                    self.process_url(config[self.ENV_URL])
+                if self.URL_ENVVAR in config:
+                    self.process_url(config[self.URL_ENVVAR])
 
         # Ensure everything is okay and finish up
         self.validate_config()

-- 
managing cloud instances for Eucalyptus