Merge "Correct release option show"

diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index 6dcc15d..d535512 100644 (file)
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -19,11 +19,12 @@
 #
 
 import os, sys
-import yum
+
 import rpmUtils
-from pykickstart import parser as ksparser
+import yum
 
 from mic import msger
+from mic.kickstart import ksparser
 from mic.utils import rpmmisc, fs_related as fs
 from mic.utils.errors import CreatorError
 from mic.imager.baseimager import BaseImageCreator

diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index 3d23172..40da7a4 100644 (file)
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -28,7 +28,7 @@ class FsPlugin(ImagerPlugin):
     name = 'fs'
 
     @classmethod
-    @cmdln.option("--include-src", dest="include_src", help="include source pakcage")
+    @cmdln.option("--include-src", dest="include_src", action="store_true", default=False, help="Generate a image with source rpms included")
     def do_create(self, subcmd, opts, *args):
         """${cmd_name}: create fs image
 

diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index 481e91a..1d9e9c5 100644 (file)
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -153,14 +153,16 @@ class LiveCDPlugin(ImagerPlugin):
         convertor._LoopImageCreator__imgdir = base_on_dir
         convertor._set_fstype("ext3")
         convertor._set_image_size(srcimgsize)
-        convertor.mount()
-        __mkinitrd(convertor)
-        convertor._create_bootconfig()
-        __run_post_cleanups(convertor)
-        convertor.unmount()
-        convertor.package()
-        convertor.print_outimage_info()
-        shutil.rmtree(base_on_dir, ignore_errors = True)
+        try:
+            convertor.mount()
+            __mkinitrd(convertor)
+            convertor._create_bootconfig()
+            __run_post_cleanups(convertor)
+            convertor.unmount()
+            convertor.package()
+            convertor.print_outimage_info()
+        finally:
+            shutil.rmtree(base_on_dir, ignore_errors = True)
 
     @classmethod
     def do_unpack(cls, srcimg):

diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index 7f4e932..02cfaf9 100644 (file)
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -155,14 +155,16 @@ class LiveUSBPlugin(ImagerPlugin):
         convertor._set_image_size(srcimgsize)
         base_on_dir = os.path.dirname(base_on)
         convertor._LoopImageCreator__imgdir = base_on_dir
-        convertor.mount()
-        __mkinitrd(convertor)
-        convertor._create_bootconfig()
-        __run_post_cleanups(convertor)
-        convertor.unmount()
-        convertor.package()
-        convertor.print_outimage_info()
-        shutil.rmtree(base_on_dir, ignore_errors = True)
+        try:
+            convertor.mount()
+            __mkinitrd(convertor)
+            convertor._create_bootconfig()
+            __run_post_cleanups(convertor)
+            convertor.unmount()
+            convertor.package()
+            convertor.print_outimage_info()
+        finally:
+            shutil.rmtree(base_on_dir, ignore_errors = True)
 
     @classmethod
     def do_unpack(cls, srcimg):

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 604049c..5f58001 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -196,7 +196,7 @@ class RawPlugin(ImagerPlugin):
         msger.info("`dd` image ...")
         rc = runner.show(args)
         srcloop.cleanup()
-        shutil.rmtree(srcmnt, ignore_errors = True)
+        shutil.rmtree(os.path.dirname(srcmnt), ignore_errors = True)
 
         if rc != 0:
             raise errors.CreatorError("Failed to dd")