rpm5 fix

[packages/rpmlint.git] / revert-9f71923e.patch

diff --git a/revert-9f71923e.patch b/revert-9f71923e.patch
new file mode 100644 (file)
index 0000000..136f3c7
--- /dev/null
+++ b/revert-9f71923e.patch
@@ -0,0 +1,33 @@
+self.header.format("%{ARCH}") does not work in rpm5
+(partial) revert to self.header[rpm.RPMTAG_ARCH]
+
+======================================================================
+ERROR: testcheck (__main__.TestPamCheck)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/home/users/glen/rpm/packages/BUILD.x86_64-linux/rpmlint-1.6/test//test.PamCheck.py", line 12, in setUp
+    self.pkg = Testing.getTestedPackage('binary/PamCheck')
+  File "/home/users/glen/rpm/packages/BUILD.x86_64-linux/rpmlint-1.6/tools/Testing.py", line 37, in getTestedPackage
+    return Pkg.Pkg(pkg_path, tempfile.gettempdir())
+  File "/home/users/glen/rpm/packages/BUILD.x86_64-linux/rpmlint-1.6/Pkg.py", line 492, in __init__
+    self.arch = self.header.format("%{ARCH}")
+TypeError: 'list' object is not callable
+
+commit 9f71923e9bfb82f52ab60ebb22a03e0c827ff1ad
+Author: Ville Skyttä <ville.skytta@iki.fi>
+Date:   Sat Feb 8 22:34:50 2014 +0200
+
+Python 3 compatibility tweaks
+
+--- a/Pkg.py
++++ b/Pkg.py
+@@ -448,8 +448,8 @@ class Pkg:
+             self.arch = 'nosrc'
+         elif self.isSource():
+             self.arch = 'src'
+         else:
+-            self.arch = self.header.format("%{ARCH}")
++            self.arch = self.header[rpm.RPMTAG_ARCH]
+ 
+     # Return true if the package is a source package
+     def isSource(self):