From a8be30653e5cd294b8c66564222c88bea627fad6 Mon Sep 17 00:00:00 2001 From: "eric@voxon.co" Date: Tue, 16 Aug 2016 22:34:07 +0000 Subject: [PATCH] Fix rpm stat for EPOCH (none). --- Providers/Scripts/2.4x-2.5x/Scripts/nxPackage.py | 3 ++- Providers/Scripts/2.6x-2.7x/Scripts/nxPackage.py | 3 ++- Providers/Scripts/3.x/Scripts/nxPackage.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Providers/Scripts/2.4x-2.5x/Scripts/nxPackage.py b/Providers/Scripts/2.4x-2.5x/Scripts/nxPackage.py index bb03ce0ce..0befbe001 100644 --- a/Providers/Scripts/2.4x-2.5x/Scripts/nxPackage.py +++ b/Providers/Scripts/2.4x-2.5x/Scripts/nxPackage.py @@ -299,7 +299,7 @@ def __init__(self, Ensure, PackageManager, Name, FilePath, PackageGroup, Argumen self.cmds['rpm']['present'] = 'rpm % -i ' self.cmds['rpm']['absent'] = 'rpm % -e ' self.cmds['rpm'][ - 'stat'] = 'rpm -q --queryformat "%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n" | sed "s/(none)/0/g" ' + 'stat'] = 'rpm -q --queryformat "%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n" ' self.cmds['rpm'][ 'stat_all'] = 'rpm -qa --queryformat "%{NAME}|%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n@@" | sed "s/(none)/0/g" ' self.cmds['rpm']['stat_group'] = None @@ -669,6 +669,7 @@ def Get(Ensure, PackageManager, Name, FilePath, PackageGroup, Arguments, ReturnC 'ERROR', 'ERROR - Unable to initialize nxPackageProvider. ' + str(e)) return [retval, p.PackageDescription, p.Publisher, p.InstalledOn, p.Size, p.Version, installed] installed, out = IsPackageInstalled(p) + out = out.replace('(none)','0') # for rpm EPOCH. ParseInfo(p, out) return [0, p.PackageManager, p.PackageDescription, p.Publisher, p.InstalledOn, p.Size, p.Version, installed, p.Architecture] diff --git a/Providers/Scripts/2.6x-2.7x/Scripts/nxPackage.py b/Providers/Scripts/2.6x-2.7x/Scripts/nxPackage.py index 4a237a550..f4df66ac7 100644 --- a/Providers/Scripts/2.6x-2.7x/Scripts/nxPackage.py +++ b/Providers/Scripts/2.6x-2.7x/Scripts/nxPackage.py @@ -301,7 +301,7 @@ def __init__(self, Ensure, PackageManager, Name, FilePath, PackageGroup, Argumen self.cmds['rpm']['present'] = 'rpm % -i ' self.cmds['rpm']['absent'] = 'rpm % -e ' self.cmds['rpm'][ - 'stat'] = 'rpm -q --queryformat "%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n" | sed "s/(none)/0/g" ' + 'stat'] = 'rpm -q --queryformat "%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n" ' self.cmds['rpm'][ 'stat_all'] = 'rpm -qa --queryformat "%{NAME}|%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n@@" | sed "s/(none)/0/g" ' self.cmds['rpm']['stat_group'] = None @@ -669,6 +669,7 @@ def Get(Ensure, PackageManager, Name, FilePath, PackageGroup, Arguments, ReturnC 'ERROR', 'ERROR - Unable to initialize nxPackageProvider. ' + e.message) return [retval, p.PackageDescription, p.Publisher, p.InstalledOn, p.Size, p.Version, installed] installed, out = IsPackageInstalled(p) + out = out.replace('(none)','0') # for rpm EPOCH. ParseInfo(p, out) return [0, p.PackageManager, p.PackageDescription, p.Publisher, p.InstalledOn, p.Size, p.Version, installed, p.Architecture] diff --git a/Providers/Scripts/3.x/Scripts/nxPackage.py b/Providers/Scripts/3.x/Scripts/nxPackage.py index 507f7f5c1..dc554183b 100644 --- a/Providers/Scripts/3.x/Scripts/nxPackage.py +++ b/Providers/Scripts/3.x/Scripts/nxPackage.py @@ -289,7 +289,7 @@ def __init__(self, Ensure, PackageManager, Name, FilePath, PackageGroup, Argumen self.cmds['rpm']['present'] = 'rpm % -i ' self.cmds['rpm']['absent'] = 'rpm % -e ' self.cmds['rpm'][ - 'stat'] = 'rpm -q --queryformat "%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n" | sed "s/(none)/0/g" ' + 'stat'] = 'rpm -q --queryformat "%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n" ' self.cmds['rpm'][ 'stat_all'] = 'rpm -qa --queryformat "%{NAME}|%{SUMMARY}|%{PACKAGER}|%{INSTALLTIME}|%{SIZE}|%{EPOCH}:%{VERSION}-%{RELEASE}|installed|%{ARCH}\n@@" | sed "s/(none)/0/g" ' self.cmds['rpm']['stat_group'] = None @@ -656,6 +656,7 @@ def Get(Ensure, PackageManager, Name, FilePath, PackageGroup, Arguments, ReturnC 'ERROR', 'ERROR - Unable to initialize nxPackageProvider. ' + str(e)) return [retval, p.PackageDescription, p.Publisher, p.InstalledOn, p.Size, p.Version, installed] installed, out = IsPackageInstalled(p) + out = out.replace('(none)','0') # for rpm EPOCH. ParseInfo(p, out) return [0, p.PackageManager, p.PackageDescription, p.Publisher, p.InstalledOn, p.Size, p.Version, installed, p.Architecture]