From 4330a8c0d23fae1520679136a92d9f0c734f1ad6 Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Tue, 31 Jan 2012 11:14:09 +0800 Subject: [PATCH] Use the same packages list format with old mic --- plugins/backend/yumpkgmgr.py | 2 +- plugins/backend/zypppkgmgr.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py index ed6732b..2971f71 100644 --- a/plugins/backend/yumpkgmgr.py +++ b/plugins/backend/yumpkgmgr.py @@ -270,7 +270,7 @@ class Yum(BackendPlugin, yum.YumBase): # record all pkg and the content for pkg in dlpkgs: - pkg_long_name = "%s-%s.%s.rpm" % (pkg.name, pkg.printVer(), pkg.arch) + pkg_long_name = "%s.%s %s" % (pkg.name, pkg.arch, pkg.printVer()) self.__pkgs_content[pkg_long_name] = pkg.files license = pkg.license if license in self.__pkgs_license.keys(): diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py index 42ff610..f32b6a6 100644 --- a/plugins/backend/zypppkgmgr.py +++ b/plugins/backend/zypppkgmgr.py @@ -337,10 +337,10 @@ class Zypp(BackendPlugin): license = '' if pkg.name() in localpkgs: hdr = rpmmisc.readRpmHeader(self.ts, self.localpkgs[pkg.name()]) - pkg_long_name = "%s-%s-%s.%s.rpm" % (hdr['name'], hdr['version'], hdr['release'], hdr['arch']) + pkg_long_name = "%s.%s %s-%s" % (hdr['name'], hdr['arch'], hdr['version'], hdr['release']) license = hdr['license'] else: - pkg_long_name = "%s-%s.%s.rpm" % (pkg.name(), pkg.edition(), pkg.arch()) + pkg_long_name = "%s.%s %s" % (pkg.name(), pkg.arch(), pkg.edition()) package = zypp.asKindPackage(pkg) license = package.license() self.__pkgs_content[pkg_long_name] = {} #TBD: to get file list -- 2.7.4