[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, experimental, updated. debian/2.1.1-1_experimental1-51-g95835b7

[Garrett Holmstrom]

The following commit has been merged in the experimental branch:
commit 5812acfe8bcde26779d3e3e0cdd972539236c0ec
Merge: cbcf3762a718950fc9e21b3e6e24733d3acdb755 cd1691b766c165d958d78344926e74d6df4851bf
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Sep 28 15:27:00 2012 -0700

    Merge branch 'master' into 2.1-maint
    
    Aside from dropping pre-generated man pages, the master branch
    contains no major features or backwards-incompatible fixes.  Since a
    major refactoring is already in progress we are unlikely to have a
    '2.2' series, so we sync the fixes from the 'master' branch to keep
    things simple.

diff --combined euca2ools/commands/euca/bundleimage.py
index c6cd5c3,352bcb0..7b278ac
--- a/euca2ools/commands/euca/bundleimage.py
+++ b/euca2ools/commands/euca/bundleimage.py
@@@ -34,7 -34,6 +34,7 @@@ import euca2ools.commands.eucacomman
  from boto.roboto.param import Param
  import euca2ools.bundler
  from euca2ools.exceptions import NotFoundError, CommandFailed
 +import sys
  
  class BundleImage(euca2ools.commands.eucacommand.EucaCommand):
  
@@@ -82,7 -81,7 +82,7 @@@
                 Param(name='target_arch',
                       short_name='r', long_name='arch',
                       optional=True, ptype='string', default='x86_64',
-                      choices=['i386', 'x86_64'],
+                      choices=['i386', 'x86_64', 'armhf'],
                       doc='Target architecture for the image.'),
                 Param(name='batch', long_name='batch',
                       optional=True, ptype='boolean',
diff --combined euca2ools/commands/eustore/installimage.py
index 1239b40,f18040a..e15415d
--- a/euca2ools/commands/eustore/installimage.py
+++ b/euca2ools/commands/eustore/installimage.py
@@@ -36,6 -36,7 +36,7 @@@ import o
  import sys
  import tarfile
  import hashlib
+ import re
  import zlib
  import tempfile
  import urllib2
@@@ -164,7 -165,7 +165,7 @@@ class InstallImage(AWSQueryRequest)
              print type+": "+name+" is already installed on the cloud, skipping installation of another one."
              return True
          else:
 -            answer = raw_input(type+": "+name+" is already installed on ths cloud. Would you like to use it intead?(y/N)")
 +            answer = raw_input(type + ": " + name + " is already installed on this cloud. Would you like to use it instead? (y/N)")
              if (answer=='y' or answer=='Y'):
                  return True
              return False
@@@ -268,14 -269,15 +269,15 @@@
                          if not(kernel_dir) and (os.path.dirname(path) != tar_root):
                              continue;
                          if not name.startswith('.'):
-                             if name.startswith('vmlin'):
+                             # Note that vmlinuz is not always at the beginning of the filename
+                             if name.find('vmlinu') != -1:
                                  print "Bundling/uploading kernel"
                                  if prefix:
                                      name = prefix+name
                                  kernel_id = self.bundleFile(path, name, description, arch, 'true', None)
                                  kernel_found = True
                                  print kernel_id
-                             elif name.startswith('initrd'):
+                             elif re.match(".*(initr(d|amfs)|loader).*", name):
                                  print "Bundling/uploading ramdisk"
                                  if prefix:
                                      name = prefix+name

-- 
managing cloud instances for Eucalyptus