Reuse cached rpm between yum and zypp, making the same package dir for them

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

diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index 4fb0b17..b855034 100644 (file)
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -46,6 +46,13 @@ class MyYumRepository(yum.yumRepo.YumRepository):
     def __del__(self):
         pass
 
+    def dirSetup(self):
+        super(MyYumRepository, self).dirSetup()
+        # relocate package dir
+        pkgdir = os.path.join(self.basecachedir, 'packages', self.id)
+        self.setAttribute('_dir_setup_pkgdir', pkgdir)
+        self._dirSetupMkdir_p(self.pkgdir)
+
     def _getFile(self, url=None,
                        relative=None,
                        local=None,

diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py
index 2064cd7..13f7759 100755 (executable)
--- a/plugins/backend/zypppkgmgr.py
+++ b/plugins/backend/zypppkgmgr.py
@@ -548,7 +548,7 @@ class Zypp(BackendPlugin):
         cacheroot = repoinfo.packagesPath()
         location= zypp.asKindPackage(po).location()
         rpmpath = str(location.filename())
-        pkgpath = "%s/%s" % (cacheroot, rpmpath)
+        pkgpath = "%s/%s" % (cacheroot, os.path.basename(rpmpath))
         return pkgpath
 
     def installLocal(self, pkg, po=None, updateonly=False):