pld-ftp-admin: modules/ftptree.py, modules/sign.py, wwwbin/clean-dups-archi...

[baggins]

Author: baggins                      Date: Sat Sep 22 20:01:24 2012 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- _RPMVSF_NOSIGNATURES and _RPMVSF_NODIGESTS have been removed in rpm 5

---- Files affected:
pld-ftp-admin/modules:
   ftptree.py (1.56 -> 1.57) , sign.py (1.6 -> 1.7) 
pld-ftp-admin/wwwbin:
   clean-dups-archive.py (1.1 -> 1.2) , clean-dups.py (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.56 pld-ftp-admin/modules/ftptree.py:1.57
--- pld-ftp-admin/modules/ftptree.py:1.56	Tue Aug  7 11:54:52 2012
+++ pld-ftp-admin/modules/ftptree.py	Sat Sep 22 22:01:19 2012
@@ -196,7 +196,6 @@
         """
         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)

================================================================
Index: pld-ftp-admin/modules/sign.py
diff -u pld-ftp-admin/modules/sign.py:1.6 pld-ftp-admin/modules/sign.py:1.7
--- pld-ftp-admin/modules/sign.py:1.6	Sat Aug 13 07:29:58 2011
+++ pld-ftp-admin/modules/sign.py	Sat Sep 22 22:01:19 2012
@@ -27,7 +27,6 @@
         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)

================================================================
Index: pld-ftp-admin/wwwbin/clean-dups-archive.py
diff -u pld-ftp-admin/wwwbin/clean-dups-archive.py:1.1 pld-ftp-admin/wwwbin/clean-dups-archive.py:1.2
--- pld-ftp-admin/wwwbin/clean-dups-archive.py:1.1	Fri May  4 08:09:41 2012
+++ pld-ftp-admin/wwwbin/clean-dups-archive.py	Sat Sep 22 22:01:19 2012
@@ -12,7 +12,7 @@
 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:

================================================================
Index: pld-ftp-admin/wwwbin/clean-dups.py
diff -u pld-ftp-admin/wwwbin/clean-dups.py:1.2 pld-ftp-admin/wwwbin/clean-dups.py:1.3
--- pld-ftp-admin/wwwbin/clean-dups.py:1.2	Sat Aug 11 12:15:17 2012
+++ pld-ftp-admin/wwwbin/clean-dups.py	Sat Sep 22 22:01:19 2012
@@ -32,7 +32,7 @@
         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:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/modules/ftptree.py?r1=1.56&r2=1.57
    http://cvs.pld-linux.org/pld-ftp-admin/modules/sign.py?r1=1.6&r2=1.7
    http://cvs.pld-linux.org/pld-ftp-admin/wwwbin/clean-dups-archive.py?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/pld-ftp-admin/wwwbin/clean-dups.py?r1=1.2&r2=1.3