[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 44b8acc09e53930208756b307c4c5afe3893de26
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue May 14 14:54:23 2013 -0700

    Clean up headers and indentation

diff --git a/euca2ools/commands/bundle/bundlevol.py b/euca2ools/commands/bundle/bundlevol.py
index ad753aa..89b395d 100644
--- a/euca2ools/commands/bundle/bundlevol.py
+++ b/euca2ools/commands/bundle/bundlevol.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2013, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,9 +27,6 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-#         Mitch Garnaat mgarnaat at eucalyptus.com
 
 import copy
 import os
@@ -123,8 +120,8 @@ class BundleVol(BundleCreator):
             if not self.args.get('block_device_mappings'):
                 self.args['block_device_mappings'] = \
                     get_metadata_dict('block-device-mapping')
-                self.log.debug("inheriting block device mappings: {0}"
-                               .format(self.args.get('block_device_mappings')))
+                self.log.debug("inheriting block device mappings: {0}".format(
+                    self.args.get('block_device_mappings')))
             #
             # Product codes and ancestor ids are special cases since they
             # aren't always there.
@@ -174,7 +171,7 @@ class BundleVol(BundleCreator):
     def main(self):
         if self.args.get('inherit'):
             self._inherit_metadata()
-        
+
         image_file = ImageCreator(log=self.log, **self.args).run()
         try:
             image_args = self._filter_args_for_bundle_image()
diff --git a/euca2ools/commands/bundle/helpers.py b/euca2ools/commands/bundle/helpers.py
index 7d64eca..781b260 100644
--- a/euca2ools/commands/bundle/helpers.py
+++ b/euca2ools/commands/bundle/helpers.py
@@ -140,5 +140,5 @@ def get_metadata_dict(*paths):
     of the metadata url.
     """
     items = get_metadata_list(*paths)
-    return dict((item, get_metadata(*(list(paths) + [item]))) \
-                    for item in items)
+    return dict((item, get_metadata(*(list(paths) + [item])))
+                for item in items)
diff --git a/euca2ools/commands/bundle/imagecreator.py b/euca2ools/commands/bundle/imagecreator.py
index 0d4186f..2df85da 100644
--- a/euca2ools/commands/bundle/imagecreator.py
+++ b/euca2ools/commands/bundle/imagecreator.py
@@ -27,7 +27,6 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
 
 from euca2ools.utils import sanitize_path
 from euca2ools.utils import mkdtemp_for_large_files as mkdtemp
@@ -261,7 +260,7 @@ class VolumeSync(object):
             cmd.extend(['--include', include])
         cmd.extend(glob.glob(os.path.join(self.volume, '*')))
         cmd.append(self.mpoint + os.path.sep)
-        
+
         try:
             if self.log:
                 self.log.debug('executing {0}'.format(cmd))
@@ -399,7 +398,7 @@ class ImageCreator(object):
         finally:
             os.remove(devnode)
             os.rmdir(directory)
-   
+
     def _make_filesystem(self, type='ext3', uuid=None, label=None):
         """Format our raw image.
         :param type: (optional) Filesystem type, one of ext3, ext4, xfs, btrfs.
diff --git a/euca2ools/exceptions.py b/euca2ools/exceptions.py
index 1b0f9f9..d0dfd5a 100644
--- a/euca2ools/exceptions.py
+++ b/euca2ools/exceptions.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2013, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,9 +27,6 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-
 
 class EucaError(Exception):
 

-- 
managing cloud instances for Eucalyptus