remove all the unnecessary wildcard import

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 3fa34e2..40add2d 100644 (file)
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -27,10 +27,10 @@ import glob
 
 import rpm
 
-from mic.utils.errors import *
-from mic.utils.fs_related import *
-from mic.utils.rpmmisc import *
-from mic.utils.misc import *
+from mic.utils.errors import CreatorError
+from mic.utils.misc import get_filesystem_avail, is_statically_linked,setup_qemu_emulator, create_release
+from mic.utils.fs_related import find_binary_path, makedirs, BindChrootMount
+from mic.utils import rpmmisc
 from mic import kickstart
 from mic import msger
 
@@ -124,8 +124,9 @@ class BaseImageCreator(object):
                     break
 
     def set_target_arch(self, arch):
-        if arch not in arches.keys():
+        if arch not in rpmmisc.arches:
             return False
+
         self.target_arch = arch
         if self.target_arch.startswith("arm"):
             for dep in self._dep_checks:
@@ -320,7 +321,7 @@ class BaseImageCreator(object):
         excluded_packages = []
         for rpm_path in self._get_local_packages():
             rpm_name = os.path.basename(rpm_path)
-            package_name = splitFilename(rpm_name)[0]
+            package_name = rpmmisc.splitFilename(rpm_name)[0]
             excluded_packages += [package_name]
         return excluded_packages
 
@@ -881,6 +882,7 @@ class BaseImageCreator(object):
     def __save_repo_keys(self, repodata):
         if not repodata:
             return None
+
         gpgkeydir = "/etc/pki/rpm-gpg"
         makedirs(self._instroot + gpgkeydir)
         for repo in repodata:
@@ -900,6 +902,7 @@ class BaseImageCreator(object):
         """
         ksh = self.ks.handler
 
+        msger.info('Applying configurations ...')
         try:
             kickstart.LanguageConfig(self._instroot).apply(ksh.lang)
             kickstart.KeyboardConfig(self._instroot).apply(ksh.keyboard)

diff --git a/mic/imager/liveusb.py b/mic/imager/liveusb.py
index ade4203..3f4a69a 100644 (file)
--- a/mic/imager/liveusb.py
+++ b/mic/imager/liveusb.py
@@ -24,7 +24,7 @@ import re
 import mic.utils.fs_related as fs_related
 import mic.utils.misc as misc
 from livecd import LiveCDImageCreator
-from mic.utils.errors import *
+from mic.utils.errors import CreatorError
 from mic.utils.partitionedfs import PartitionedMount
 from mic import msger
 

diff --git a/mic/imager/loop.py b/mic/imager/loop.py
index c3e111d..8ac1a4f 100644 (file)
--- a/mic/imager/loop.py
+++ b/mic/imager/loop.py
@@ -18,11 +18,13 @@
 
 import os
 import subprocess
+import shutil
 from baseimager import BaseImageCreator
-from mic.utils.errors import *
-from mic.utils.fs_related import *
-from mic.utils.misc import *
+from mic.utils.errors import CreatorError
 from mic import kickstart
+from mic import msger
+
+from mic.utils.fs_related import ExtDiskMount, BtrfsDiskMount, SparseLoopbackDisk
 
 FSLABEL_MAXLEN = 32
 """The maximum string length supported for LoopImageCreator.fslabel."""

diff --git a/mic/imager/raw.py b/mic/imager/raw.py
index 16a39ff..2d74874 100644 (file)
--- a/mic/imager/raw.py
+++ b/mic/imager/raw.py
@@ -26,11 +26,10 @@ import mic.utils.fs_related as fs_related
 import urlgrabber.progress as progress
 from baseimager import BaseImageCreator
 from mic.utils.partitionedfs import PartitionedMount
-from mic.utils.errors import *
+from mic.utils.errors import CreatorError, MountError
 from mic import kickstart
 from mic import msger
 
-
 class RawImageCreator(BaseImageCreator):
     """Installs a system into a file containing a partitioned disk image.
 

diff --git a/mic/utils/errors.py b/mic/utils/errors.py
index 3b0c861..51e550d 100644 (file)
--- a/mic/utils/errors.py
+++ b/mic/utils/errors.py
@@ -31,9 +31,12 @@ class CreatorError(Exception):
 
 class KsError(CreatorError):
     pass
+
 class MountError(CreatorError):
     pass
+
 class SnapshotError(CreatorError):
     pass
+
 class SquashfsError(CreatorError):
     pass

diff --git a/mic/utils/rpmmisc.py b/mic/utils/rpmmisc.py
index 71f344b..b0d9d60 100644 (file)
--- a/mic/utils/rpmmisc.py
+++ b/mic/utils/rpmmisc.py
@@ -55,7 +55,7 @@ class RPMInstallCallback:
 
     def _localprint(self, msg):
         if self.output:
-            print msg
+            msger.info(msg)
 
     def _makefmt(self, percent, progress = True):
         l = len(str(self.total_actions))
@@ -130,11 +130,13 @@ class RPMInstallCallback:
                     fmt = self._makefmt(percent)
                     msg = fmt % ("Installing")
                     if msg != self.lastmsg:
-                        sys.stdout.write(msg)
-                        sys.stdout.flush()
                         self.lastmsg = msg
+
+                        msger.info(msg)
+
                         if self.total_installed == self.total_actions:
-                             msger.verbose('\n' + '\n'.join(self.logString))
+                            msger.raw('\n')
+                            msger.verbose('\n'.join(self.logString))
 
         elif what == rpm.RPMCALLBACK_UNINST_START:
             pass
@@ -147,8 +149,10 @@ class RPMInstallCallback:
 
         elif what == rpm.RPMCALLBACK_REPACKAGE_START:
             pass
+
         elif what == rpm.RPMCALLBACK_REPACKAGE_STOP:
             pass
+
         elif what == rpm.RPMCALLBACK_REPACKAGE_PROGRESS:
             pass
 

diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py
index 9bec093..29af211 100644 (file)
--- a/plugins/backend/zypppkgmgr.py
+++ b/plugins/backend/zypppkgmgr.py
@@ -523,7 +523,7 @@ class Zypp(BackendPlugin):
         print "%d packages to be installed, %d packages gotten from cache, %d packages to be downloaded" % (total_count, cached_count, download_count)
         try:
             if download_count > 0:
-                print "downloading packages..."
+                print "Downloading packages..."
             self.downloadPkgs(dlpkgs, download_count)
             self.installPkgs(dlpkgs)