fix mic chroot failure caused by unmatching parameters

in do_chroot, cmd should have default value,
otherwise the caller in former code will be failed

Change-Id: Iaeb605f744083e23d9745dde4338137033e4c1b3

Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index 70985b71163f4f70b219a0c36931e8774213773b..47df1bb0fc60f4f65a1e93db84cc36745c6f8249 100644 (file)
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -126,7 +126,7 @@ class FsPlugin(ImagerPlugin):
         return 0
 
     @classmethod
-    def do_chroot(self, target, cmd):#chroot.py parse opts&args
+    def do_chroot(self, target, cmd=[]):#chroot.py parse opts&args
             try:
                 if len(cmd) != 0:
                     cmdline = ' '.join(cmd)

diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index 98b6dbb373edd50d11ecd822a98f125551afe6e8..26c2d11520ad0bd6f537cd50431c3ec0ab335487 100644 (file)
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -118,7 +118,7 @@ class LiveCDPlugin(ImagerPlugin):
         return 0
 
     @classmethod
-    def do_chroot(cls, target, cmd):
+    def do_chroot(cls, target, cmd=[]):
         os_image = cls.do_unpack(target)
         os_image_dir = os.path.dirname(os_image)
 

diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index e0f079af7d737e701b4d03d3d42c8b2919f23d76..babcfa613d39a82df8ad4d6e1293021bb944f2ba 100644 (file)
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -119,7 +119,7 @@ class LiveUSBPlugin(ImagerPlugin):
         return 0
 
     @classmethod
-    def do_chroot(cls, target, cmd):
+    def do_chroot(cls, target, cmd=[]):
         os_image = cls.do_unpack(target)
         os_image_dir = os.path.dirname(os_image)
 

diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py
index 78cde65b310243d255f71b36f18f47512d407627..7e3141f79882324638f07f3ac1fa4069ec5cb1d3 100644 (file)
--- a/plugins/imager/loop_plugin.py
+++ b/plugins/imager/loop_plugin.py
@@ -131,7 +131,7 @@ class LoopPlugin(ImagerPlugin):
         return 0
 
     @classmethod
-    def _do_chroot_tar(cls, target, cmd):
+    def _do_chroot_tar(cls, target, cmd=[]):
         mountfp_xml = os.path.splitext(target)[0] + '.xml'
         if not os.path.exists(mountfp_xml):
             raise errors.CreatorError("No mount point file found for this tar "
@@ -192,7 +192,7 @@ class LoopPlugin(ImagerPlugin):
             shutil.rmtree(tmpdir, ignore_errors=True)
 
     @classmethod
-    def do_chroot(cls, target, cmd):
+    def do_chroot(cls, target, cmd=[]):
         if target.endswith('.tar'):
             import tarfile
             if tarfile.is_tarfile(target):

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 2de058f2ad3592f2855e5c58bcc041382873610d..5c8be609e559064731b2afe309474ffeb366ca9b 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -129,7 +129,7 @@ class RawPlugin(ImagerPlugin):
         return 0
 
     @classmethod
-    def do_chroot(cls, target, cmd):
+    def do_chroot(cls, target, cmd=[]):
         img = target
         imgsize = misc.get_file_size(img) * 1024L * 1024L
         partedcmd = fs_related.find_binary_path("parted")