reformat rpm name string to be more flexible

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

diff --git a/mic/utils/misc.py b/mic/utils/misc.py
index 31bf00e..ead3fe0 100644 (file)
--- a/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@ -49,7 +49,7 @@ import runner
 from mic import msger
 
 RPM_RE  = re.compile("(.*)\.(.*) (.*)-(.*)")
-RPM_FMT = "%(name)s.%(arch)s %(ver_rel)s"
+RPM_FMT = "%(name)s.%(arch)s %(version)s-%(release)s"
 SRPM_RE = re.compile("(.*)-(\d+.*)-(\d+\.\d+).src.rpm")
 
 def build_name(kscfg, release=None, prefix = None, suffix = None):

diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index 6a94631..2bba9f8 100644 (file)
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -356,7 +356,8 @@ class Yum(BackendPlugin, yum.YumBase):
             pkg_long_name = misc.RPM_FMT % {
                                 'name': pkg.name,
                                 'arch': pkg.arch,
-                                'ver_rel': pkg.printVer(),
+                                'version': pkg.version,
+                                'release': pkg.release
                             }
             self.__pkgs_content[pkg_long_name] = pkg.files
             license = pkg.license

diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py
index 48894b2..54186d9 100755 (executable)
--- a/plugins/backend/zypppkgmgr.py
+++ b/plugins/backend/zypppkgmgr.py
@@ -417,8 +417,8 @@ class Zypp(BackendPlugin):
                 pkg_long_name = misc.RPM_FMT % {
                                     'name': hdr['name'],
                                     'arch': hdr['arch'],
-                                    'ver_rel': '%s-%s' % (hdr['version'],
-                                                          hdr['release']),
+                                    'version': hdr['version'],
+                                    'release': hdr['release']
                                 }
                 license = hdr['license']
 
@@ -426,7 +426,8 @@ class Zypp(BackendPlugin):
                 pkg_long_name = misc.RPM_FMT % {
                                     'name': pkg.name(),
                                     'arch': pkg.arch(),
-                                    'ver_rel': pkg.edition(),
+                                    'version': pkg.edition().version(),
+                                    'release': pkg.edition().release()
                                 }
 
                 package = zypp.asKindPackage(pkg)