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

[baggins]

Author: baggins                      Date: Wed Jun  5 19:52:49 2013 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- use rpm.RPMVSF_NODSAHEADER where we had NOSIGNATURES in rpm4

---- Files affected:
pld-ftp-admin/modules:
   ftptree.py (1.60 -> 1.61) , sign.py (1.8 -> 1.9) 
pld-ftp-admin/wwwbin:
   clean-dups-archive.py (1.2 -> 1.3) , clean-dups.py (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.60 pld-ftp-admin/modules/ftptree.py:1.61
--- pld-ftp-admin/modules/ftptree.py:1.60	Wed Nov  7 12:08:08 2012
+++ pld-ftp-admin/modules/ftptree.py	Wed Jun  5 21:52:44 2013
@@ -196,6 +196,7 @@
         """
         def rpmhdr(pkg):
             ts = rpm.ts()
+            ts.setVSFlags(rpm.RPMVSF_NODSAHEADER)
             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.8 pld-ftp-admin/modules/sign.py:1.9
--- pld-ftp-admin/modules/sign.py:1.8	Wed Sep 26 20:49:44 2012
+++ pld-ftp-admin/modules/sign.py	Wed Jun  5 21:52:44 2013
@@ -27,6 +27,7 @@
         return None
 
     ts = rpm.ts()
+    ts.setVSFlags(rpm.RPMVSF_NODSAHEADER)
     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.2 pld-ftp-admin/wwwbin/clean-dups-archive.py:1.3
--- pld-ftp-admin/wwwbin/clean-dups-archive.py:1.2	Sat Sep 22 22:01:19 2012
+++ pld-ftp-admin/wwwbin/clean-dups-archive.py	Wed Jun  5 21:52:44 2013
@@ -12,7 +12,7 @@
 re_nvr = re.compile('^(.*)-([^-]*)-([^-]*)\.rpm$')
 dir = '/home/pld/admins/th/ftp/.archive/PLD/SRPMS/RPMS'
 
-ts = rpm.TransactionSet("", (rpm.RPMVSF_NOHDRCHK or rpm.RPMVSF_NEEDPAYLOAD))
+ts = rpm.TransactionSet("", (rpm.RPMVSF_NOHDRCHK or rpm.RPMVSF_NEEDPAYLOAD or rpm.RPMVSF_NODSAHEADER))
 
 def compare(f1, f2):
 	try:

================================================================
Index: pld-ftp-admin/wwwbin/clean-dups.py
diff -u pld-ftp-admin/wwwbin/clean-dups.py:1.3 pld-ftp-admin/wwwbin/clean-dups.py:1.4
--- pld-ftp-admin/wwwbin/clean-dups.py:1.3	Sat Sep 22 22:01:19 2012
+++ pld-ftp-admin/wwwbin/clean-dups.py	Wed Jun  5 21:52:44 2013
@@ -32,7 +32,7 @@
         openvswitch-.*|\
         xorg-driver-video-nvidia-legacy3-.*)$')
 
-ts = rpm.TransactionSet("", (rpm.RPMVSF_NOHDRCHK or rpm.RPMVSF_NEEDPAYLOAD))
+ts = rpm.TransactionSet("", (rpm.RPMVSF_NOHDRCHK or rpm.RPMVSF_NEEDPAYLOAD or rpm.RPMVSF_NODSAHEADER))
 
 def compare(f1, f2):
 	try:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/modules/ftptree.py?r1=1.60&r2=1.61
    http://cvs.pld-linux.org/pld-ftp-admin/modules/sign.py?r1=1.8&r2=1.9
    http://cvs.pld-linux.org/pld-ftp-admin/wwwbin/clean-dups-archive.py?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/pld-ftp-admin/wwwbin/clean-dups.py?r1=1.3&r2=1.4