From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 22 Sep 2012 20:01:19 +0000 (+0000)
Subject: - _RPMVSF_NOSIGNATURES and _RPMVSF_NODIGESTS have been removed in rpm 5
X-Git-Url: http://git.pld-linux.org/?p=projects%2Fpld-ftp-admin.git;a=commitdiff_plain;h=187e16efba377f9e49533bf43613378f1cde91f4

- _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 73a8cd4..3697096 100644
--- 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 2a23e9c..d5e709f 100644
--- 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 010f2cd..4961c39 100644
--- 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 1436cc8..e5c3693 100644
--- 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: