Fix rpm stat for EPOCH (none).

microsoft · Aug 17, 2016 · a8be306 · a8be306
1 parent 90838ad
commit a8be306
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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]