[pkg-eucalyptus-commits] [euca2ools] 02/04: Make bundle manifests compatible with EC2

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to annotated tag 3.0.5
in repository euca2ools.

commit ce5a425067308f44b86fd90dea6fb021415fb4aa
Author: Garrett Holmstrom <gholms at devzero.com>
Date:   Thu Nov 20 14:54:15 2014 -0800

    Make bundle manifests compatible with EC2
    
    This is a backport of commits e565f32 through 8b7fae0.
    
    Fixes TOOLS-294
---
 euca2ools/commands/bundle/__init__.py    | 2 ++
 euca2ools/commands/bundle/bundleimage.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/euca2ools/commands/bundle/__init__.py b/euca2ools/commands/bundle/__init__.py
index 2bcfb0b..bb90b73 100644
--- a/euca2ools/commands/bundle/__init__.py
+++ b/euca2ools/commands/bundle/__init__.py
@@ -167,3 +167,5 @@ def add_bundle_creds(args, config):
             args['user'] = os.getenv('EC2_USER_ID')
         elif config_account_id:
             args['user'] = config_account_id
+    if args.get('user'):
+        args['user'] = args['user'].replace('-', '')
diff --git a/euca2ools/commands/bundle/bundleimage.py b/euca2ools/commands/bundle/bundleimage.py
index a1588a8..25e8114 100644
--- a/euca2ools/commands/bundle/bundleimage.py
+++ b/euca2ools/commands/bundle/bundleimage.py
@@ -203,7 +203,7 @@ class BundleImage(BundleCreator):
                                               pretty_print=True).strip()
         self.log.debug(pretty_manifest, extra={'append': True})
         self.log.debug('-- end of manifest content --')
-        return lxml.etree.tostring(manifest)
+        return lxml.etree.tostring(manifest, xml_declaration=True).strip()
 
 
 def public_encrypt(content, cert_filename):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-eucalyptus/euca2ools.git