[pkg-eucalyptus-commits] [euca2ools] 29/41: fix per suggestion by gholmes

[Charles Plessy]

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

plessy pushed a commit to branch master
in repository euca2ools.

commit c77768961cd3b86d5ddc49f75fc5536dff5550fc
Author: Sang-Min Park <smpark.uva at gmail.com>
Date:   Tue Sep 3 10:44:07 2013 -0700

    fix per suggestion by gholmes
---
 euca2ools/nc/commands/bundleandupload.py |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/euca2ools/nc/commands/bundleandupload.py b/euca2ools/nc/commands/bundleandupload.py
index 140e0fc..d44f7e3 100644
--- a/euca2ools/nc/commands/bundleandupload.py
+++ b/euca2ools/nc/commands/bundleandupload.py
@@ -95,24 +95,15 @@ class BundleAndUpload(requestbuilder.command.BaseCommand):
 
 
     def main(self):
-        if self.args.get('kernel') and self.args.get('ramdisk'):
-            cmd = BundleImage(image=self.args['image'], arch=self.args['arch'],
-                              cert=self.args['cert'],
-                              privatekey=self.args['privatekey'],
-                              user=self.args['user'],
-                              destination=self.args.get('directory'),
-                              ec2cert=self.args['ec2cert'], image_type='machine',
-                              config=self.config,
-                              kernel=self.args['kernel'],
-                              ramdisk=self.args['ramdisk'])
-        else:
-            cmd = BundleImage(image=self.args['image'], arch=self.args['arch'],
-                              cert=self.args['cert'],
-                              privatekey=self.args['privatekey'],
-                              user=self.args['user'],
-                              destination=self.args.get('directory'),
-                              ec2cert=self.args['ec2cert'], image_type='machine',
-                              config=self.config)
+        cmd = BundleImage(image=self.args['image'], arch=self.args['arch'],
+                          cert=self.args['cert'],
+                          privatekey=self.args['privatekey'],
+                          user=self.args['user'],
+                          destination=self.args.get('directory'),
+                          ec2cert=self.args['ec2cert'], image_type='machine',
+                          config=self.config,
+                          kernel=self.args['kernel'],
+                          ramdisk=self.args['ramdisk'])
         parts, manifest = cmd.main()
 
         cmd = UploadBundle(bucket=self.args['bucket'], manifest=manifest,

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