- _RPMVSF_NOSIGNATURES and _RPMVSF_NODIGESTS have been removed in rpm 5

Changed files:
    modules/ftptree.py -> 1.57
    modules/sign.py -> 1.7
    wwwbin/clean-dups-archive.py -> 1.2
    wwwbin/clean-dups.py -> 1.3

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 73a8cd49a7c85de856c9f2dd0500c10959dbcefa..36970964e5fb0b207981768a00f878e6c54b1bdd 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -196,7 +196,6 @@ class Pkg(BasePkg):
         """
         def rpmhdr(pkg):
             ts = rpm.ts()
-            ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
             fdno = os.open(pkg, os.O_RDONLY)
             hdr = ts.hdrFromFdno(fdno)
             os.close(fdno)

diff --git a/modules/sign.py b/modules/sign.py
index 2a23e9c1678d95edbafe3f77eae2241f8c468031..d5e709f0b171b057852a85c4f1bc78c4428d70ab 100644 (file)
--- a/modules/sign.py
+++ b/modules/sign.py
@@ -27,7 +27,6 @@ def is_signed(rpm_file):
         return None
 
     ts = rpm.ts()
-    ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
     fdno = os.open(rpm_file, os.O_RDONLY)
     hdr = ts.hdrFromFdno(fdno)
     os.close(fdno)

diff --git a/wwwbin/clean-dups-archive.py b/wwwbin/clean-dups-archive.py
index 010f2cd9cfdc2da3ccb780034b05c1bab8d2fe64..4961c399c94ea84b817d0917bf20f50fa70079f8 100644 (file)
--- a/wwwbin/clean-dups-archive.py
+++ b/wwwbin/clean-dups-archive.py
@@ -12,7 +12,7 @@ re_rpm = re.compile(r'.*\.rpm$')
 re_nvr = re.compile('^(.*)-([^-]*)-([^-]*)\.rpm$')
 dir = '/home/pld/admins/th/ftp/.archive/PLD/SRPMS/RPMS'
 
-ts = rpm.TransactionSet("", (rpm._RPMVSF_NOSIGNATURES or rpm.RPMVSF_NOHDRCHK or rpm._RPMVSF_NODIGESTS or rpm.RPMVSF_NEEDPAYLOAD))
+ts = rpm.TransactionSet("", (rpm.RPMVSF_NOHDRCHK or rpm.RPMVSF_NEEDPAYLOAD))
 
 def compare(f1, f2):
        try:

diff --git a/wwwbin/clean-dups.py b/wwwbin/clean-dups.py
index 1436cc834a15903185e4f467c20cc485920feb76..e5c3693dfcd7316561c98b42d79cf00ce8b2e08d 100644 (file)
--- a/wwwbin/clean-dups.py
+++ b/wwwbin/clean-dups.py
@@ -32,7 +32,7 @@ ignore = re.compile('^(kernel-.*|\
         openvswitch-.*|\
         xorg-driver-video-nvidia-legacy3-.*)$')
 
-ts = rpm.TransactionSet("", (rpm._RPMVSF_NOSIGNATURES or rpm.RPMVSF_NOHDRCHK or rpm._RPMVSF_NODIGESTS or rpm.RPMVSF_NEEDPAYLOAD))
+ts = rpm.TransactionSet("", (rpm.RPMVSF_NOHDRCHK or rpm.RPMVSF_NEEDPAYLOAD))
 
 def compare(f1, f2):
        try: