Merge "unify RPMInstallCallback class for yum and zypp"

diff --git a/mic/utils/rpmmisc.py b/mic/utils/rpmmisc.py
index 7e524bf..8625983 100644 (file)
--- a/mic/utils/rpmmisc.py
+++ b/mic/utils/rpmmisc.py
@@ -36,6 +36,7 @@ class RPMInstallCallback:
         self.lastmsg = None
         self.tsInfo = None # this needs to be set for anything else to work
         self.ts = ts
+        self.filelog = False
         self.logString = []
 
     def _dopkgtup(self, hdr):
@@ -97,8 +98,12 @@ class RPMInstallCallback:
             self.lastmsg = None
             hdr = None
             if h is not None:
-                rpmloc = h
-                hdr = readRpmHeader(self.ts, h)
+                try:
+                    hdr, rpmloc = h
+                except:
+                    rpmloc = h
+                    hdr = readRpmHeader(self.ts, h)
+
                 handle = self._makeHandle(hdr)
                 fd = os.open(rpmloc, os.O_RDONLY)
                 self.callbackfilehandles[handle]=fd
@@ -111,8 +116,12 @@ class RPMInstallCallback:
         elif what == rpm.RPMCALLBACK_INST_CLOSE_FILE:
             hdr = None
             if h is not None:
-                rpmloc = h
-                hdr = readRpmHeader(self.ts, h)
+                try:
+                    hdr, rpmloc = h
+                except:
+                    rpmloc = h
+                    hdr = readRpmHeader(self.ts, h)
+
                 handle = self._makeHandle(hdr)
                 os.close(self.callbackfilehandles[handle])
                 fd = 0
@@ -125,11 +134,16 @@ class RPMInstallCallback:
             if h is not None:
                 percent = (self.total_installed*100L)/self.total_actions
                 if total > 0:
-                    m = re.match("(.*)-(\d+.*)-(\d+\.\d+)\.(.+)\.rpm", os.path.basename(h))
+                    try:
+                        hdr, rpmloc = h
+                    except:
+                        rpmloc = h
+
+                    m = re.match("(.*)-(\d+.*)-(\d+\.\d+)\.(.+)\.rpm", os.path.basename(rpmloc))
                     if m:
                         pkgname = m.group(1)
                     else:
-                        pkgname = os.path.basename(h)
+                        pkgname = os.path.basename(rpmloc)
                 if self.output and (sys.stdout.isatty() or self.total_installed == self.total_actions):
                     fmt = self._makefmt(percent)
                     msg = fmt % ("Installing", pkgname)

diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index ce52a54..7e59571 100644 (file)
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -27,100 +27,6 @@ from mic.utils import rpmmisc, fs_related as fs
 from mic.utils.errors import CreatorError
 from mic.imager.baseimager import BaseImageCreator
 
-def getRPMCallback():
-    sys.path.append('/usr/share/yum-cli')
-    import callback
-    import rpm
-    class MyRPMInstallCallback(callback.RPMInstallCallback):
-        def _makefmt(self, percent, progress = True):
-            l = len(str(self.total_actions))
-            size = "%s.%s" % (l, l)
-            fmt_done = "[%" + size + "s/%" + size + "s]"
-            done = fmt_done % (self.total_installed + self.total_removed,
-                               self.total_actions)
-            marks = self.marks - (2 * l)
-            width = "%s.%s" % (marks, marks)
-            fmt_bar = "%-" + width + "s"
-            if progress:
-                bar = fmt_bar % (self.mark * int(marks * (percent / 100.0)), )
-                fmt = "\r  %-10.10s: %-20.20s " + bar + " " + done
-            else:
-                bar = fmt_bar % (self.mark * marks, )
-                fmt = "  %-10.10s: %-20.20s "  + bar + " " + done
-            return fmt
-
-        def callback(self, what, bytes, total, h, user):
-            self.mark = "+"
-            if what == rpm.RPMCALLBACK_TRANS_START:
-                if bytes == 6:
-                    self.total_actions = total
-
-            elif what == rpm.RPMCALLBACK_TRANS_PROGRESS:
-                pass
-
-            elif what == rpm.RPMCALLBACK_TRANS_STOP:
-                pass
-
-            elif what == rpm.RPMCALLBACK_INST_OPEN_FILE:
-                self.lastmsg = None
-                hdr = None
-                if h is not None:
-                    hdr, rpmloc = h
-                    handle = self._makeHandle(hdr)
-                    fd = os.open(rpmloc, os.O_RDONLY)
-                    self.callbackfilehandles[handle]=fd
-                    self.total_installed += 1
-                    self.installed_pkg_names.append(hdr['name'])
-                    return fd
-                else:
-                    self._localprint("No header - huh?")
-
-            elif what == rpm.RPMCALLBACK_INST_CLOSE_FILE:
-                hdr = None
-                if h is not None:
-                    hdr, rpmloc = h
-                    handle = self._makeHandle(hdr)
-                    os.close(self.callbackfilehandles[handle])
-                    fd = 0
-
-            elif what == rpm.RPMCALLBACK_INST_PROGRESS:
-                if h is not None:
-                    percent = (self.total_installed*100L)/self.total_actions
-                    if total > 0:
-                        hdr, rpmloc = h
-                        m = re.match("(.*)-(\d+.*)-(\d+\.\d+)\.(.+)\.rpm", os.path.basename(rpmloc))
-                        if m:
-                            pkgname = m.group(1)
-                        else:
-                            pkgname = os.path.basename(rpmloc)
-                    if self.output and (sys.stdout.isatty() or self.total_installed == self.total_actions):
-                        fmt = self._makefmt(percent)
-                        msg = fmt % ("Installing", pkgname)
-                        if msg != self.lastmsg:
-                            msger.info(msg)
-                            self.lastmsg = msg
-                            if self.total_installed == self.total_actions:
-                                msger.raw()
-
-            elif what == rpm.RPMCALLBACK_UNINST_START:
-                pass
-
-            elif what == rpm.RPMCALLBACK_UNINST_PROGRESS:
-                pass
-
-            elif what == rpm.RPMCALLBACK_UNINST_STOP:
-                self.total_removed += 1
-
-            elif what == rpm.RPMCALLBACK_REPACKAGE_START:
-                pass
-            elif what == rpm.RPMCALLBACK_REPACKAGE_STOP:
-                pass
-            elif what == rpm.RPMCALLBACK_REPACKAGE_PROGRESS:
-                pass
-
-    cb = MyRPMInstallCallback()
-    return cb
-
 class MyYumRepository(yum.yumRepo.YumRepository):
     def __init__(self, repoid):
         yum.yumRepo.YumRepository.__init__(self, repoid)
@@ -394,7 +300,7 @@ class Yum(BackendPlugin, yum.YumBase):
                 raise CreatorError("ordering packages for installation failed!")
 
             # FIXME: callback should be refactored a little in yum
-            cb = getRPMCallback()
+            cb = rpmmisc.RPMInstallCallback(self.ts)
             cb.tsInfo = self.tsInfo
             cb.filelog = False