Make BundleAndUploadImage tolerate missing cert/key

eucalyptus · Nov 25, 2015 · f04e631 · f04e631
1 parent 7708002
commit f04e631
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/euca2ools/commands/bundle/bundleanduploadimage.py b/euca2ools/commands/bundle/bundleanduploadimage.py
@@ -101,8 +101,8 @@ def main(self):
         manifest = self.build_manifest(digest, partinfo)
         manifest_filename = '{0}.manifest.xml'.format(path_prefix)
         with open(manifest_filename, 'w') as manifest_file:
-            manifest.dump_to_file(manifest_file, self.args['privatekey'],
-                                  self.args['cert'], self.args['ec2cert'])
+            manifest.dump_to_file(manifest_file, self.args.get('privatekey'),
+                                  self.args.get('cert'), self.args['ec2cert'])
         manifest_dest = key_prefix + os.path.basename(manifest_filename)
         self.upload_bundle_file(manifest_filename, manifest_dest,
                                 show_progress=self.args.get('show_progress'))