[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 89b9fe9f8402e43d764ce63100e1fe08fbc2c54d
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu Feb 21 09:25:29 2013 -0800

    Fix a few missed typos

diff --git a/euca2ools/__init__.py b/euca2ools/__init__.py
index b408889..a0d5180 100644
--- a/euca2ools/__init__.py
+++ b/euca2ools/__init__.py
@@ -42,7 +42,7 @@ if '__file__' in globals():
                                env={'GIT_DIR': os.path.join(repo_path, '.git')})
         git.wait()
         git.stderr.read()
-        if git.exitcode == 0:
+        if git.returncode == 0:
             __version__ = git.stdout.read().strip()
             if type(__version__).__name__ == 'bytes':
                 __version__ = __version__.decode()
diff --git a/euca2ools/commands/euca/modgroup.py b/euca2ools/commands/euca/modgroup.py
index c7ec398..438f187 100644
--- a/euca2ools/commands/euca/modgroup.py
+++ b/euca2ools/commands/euca/modgroup.py
@@ -160,8 +160,8 @@ class ModifySecurityGroupRequest(EucalyptusRequest):
         # We need to parse out -t and -p *before* argparse can see it because
         # of Python bug 9334, which prevents argparse from recognizing '-1:-1'
         # as an option value and not a (nonexistent) option name.
+        saved_sys_argv = list(sys.argv)
         def parse_neg_one_value(opt_name):
-            saved_sys_argv = list(sys.argv)
             if opt_name in sys.argv:
                 index = sys.argv.index(opt_name)
                 if (index < len(sys.argv) - 1 and
@@ -173,7 +173,7 @@ class ModifySecurityGroupRequest(EucalyptusRequest):
                           parse_neg_one_value('--icmp-type-code'))
         port_range = (parse_neg_one_value('-p') or
                       parse_neg_one_value('--port-range'))
-        EucalyptusRequest._process_cli_args(self)
+        EucalyptusRequest.process_cli_args(self)
         if icmp_type_code:
             self.args['icmp_type_code'] = icmp_type_code
         if port_range:

-- 
managing cloud instances for Eucalyptus