better handling for existing files checks

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 5a7fb2b..31af6ef 100644 (file)
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -29,7 +29,7 @@ import rpm
 
 from mic import kickstart
 from mic import msger
-from mic.utils.errors import CreatorError
+from mic.utils.errors import CreatorError, Abort
 from mic.utils import misc, rpmmisc, runner, fs_related as fs
 
 class BaseImageCreator(object):
@@ -59,6 +59,9 @@ class BaseImageCreator(object):
         """
         self.pkgmgr = pkgmgr
 
+        self.__builddir = None
+        self.__bindmounts = []
+
         if createopts:
             # A pykickstart.KickstartParser instance."""
             self.ks = createopts['ks']
@@ -72,8 +75,10 @@ class BaseImageCreator(object):
 
                 # check whether destine dir exist
                 if os.path.exists(self.destdir):
-                    if msger.ask('Image dir: %s already exists, need to delete it?' % self.destdir):
+                    if msger.ask('Image dir: %s already exists, cleanup and continue?' % self.destdir):
                         shutil.rmtree(self.destdir, ignore_errors = True)
+                    else:
+                        raise Abort('Canceled')
 
                 # save log by default for --release
                 if not createopts['logfile']:
@@ -95,9 +100,6 @@ class BaseImageCreator(object):
             self.target_arch = "noarch"
             self._local_pkgs_path = None
 
-        self.__builddir = None
-        self.__bindmounts = []
-
         self._dep_checks = ["ls", "bash", "cp", "echo", "modprobe", "passwd"]
 
         #FIXME to be obsolete, make it configurable

diff --git a/mic/utils/errors.py b/mic/utils/errors.py
index 1ede190..4cf06b9 100644 (file)
--- a/mic/utils/errors.py
+++ b/mic/utils/errors.py
@@ -32,6 +32,9 @@ class Usage(CreatorError):
     def __str__(self):
         return self.keyword + str(self.msg) + ', please use "--help" for more info'
 
+class Abort(CreatorError):
+    keyword = ''
+
 class ConfigError(CreatorError):
     keyword = '<config>'
 

diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index 967cb54..344ef21 100644 (file)
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -78,9 +78,11 @@ class FsPlugin(ImagerPlugin):
         if creatoropts['release'] is None:
             fsdir = os.path.join(creator.destdir, creator.name)
             if os.path.exists(fsdir):
-                if msger.ask('The target dir: %s already exists, need to delete it?' % fsdir):
+                if msger.ask('The target dir: %s already exists, cleanup and continue?' % fsdir):
                     import shutil
                     shutil.rmtree(fsdir)
+                else:
+                    raise errors.Abort('Canceled')
 
         try:
             creator.check_depend_tools()

diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index a253023..fa1d058 100644 (file)
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -82,8 +82,10 @@ class LiveCDPlugin(ImagerPlugin):
         if creatoropts['release'] is None:
             imagefile = "%s.iso" % os.path.join(creator.destdir, creator.name)
             if os.path.exists(imagefile):
-                if msger.ask('The target image: %s already exists, need to delete it?' % imagefile):
+                if msger.ask('The target image: %s already exists, cleanup and continue?' % imagefile):
                     os.unlink(imagefile)
+                else:
+                    raise errors.Abort('Canceled')
 
         try:
             creator.check_depend_tools()

diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index 71833fc..67d204b 100644 (file)
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -84,8 +84,10 @@ class LiveUSBPlugin(ImagerPlugin):
         if creatoropts['release'] is None:
             imagefile = "%s.usbimg" % os.path.join(creator.destdir, creator.name)
             if os.path.exists(imagefile):
-                if msger.ask('The target image: %s already exists, need to delete it?' % imagefile):
+                if msger.ask('The target image: %s already exists, cleanup and continue?' % imagefile):
                     os.unlink(imagefile)
+                else:
+                    raise errors.Abort('Canceled')
 
         try:
             creator.check_depend_tools()

diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py
index 96660b8..96b585d 100644 (file)
--- a/plugins/imager/loop_plugin.py
+++ b/plugins/imager/loop_plugin.py
@@ -82,8 +82,10 @@ class LoopPlugin(ImagerPlugin):
             else:
                 imagefile = "%s.img" % os.path.join(creator.destdir, creator.name)
             if os.path.exists(imagefile):
-                if msger.ask('The target image: %s already exists, need to delete it?' % imagefile):
+                if msger.ask('The target image: %s already exists, cleanup and continue?' % imagefile):
                     os.unlink(imagefile)
+                else:
+                    raise errors.Abort('Canceled')
 
         try:
             creator.check_depend_tools()

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 6276241..9e2040e 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -81,8 +81,10 @@ class RawPlugin(ImagerPlugin):
         if creatoropts['release'] is None:
             imagefile = "%s-sda.raw" % os.path.join(creator.destdir, creator.name)
             if os.path.exists(imagefile):
-                if msger.ask('The target image: %s already exists, need to delete it?' % imagefile):
+                if msger.ask('The target image: %s already exists, cleanup and continue?' % imagefile):
                     os.unlink(imagefile)
+                else:
+                    raise errors.Abort('Canceled')
 
         try:
             creator.check_depend_tools()

diff --git a/tools/mic b/tools/mic
index 7ec9aa7..85e6afe 100755 (executable)
--- a/tools/mic
+++ b/tools/mic
@@ -170,6 +170,9 @@ if __name__ == "__main__":
     except errors.Usage, usage:
         msger.error(str(usage))
 
+    except errors.Abort, msg:
+        msger.info(str(msg))
+
     except errors.CreatorError, err:
         if msger.get_loglevel() == 'debug':
             import traceback