pld-ftp-admin: bin/pfa-genindex, modules/config.py - poldek_indexes = old d...

[glen]

Author: glen                         Date: Sun Nov 11 10:24:00 2012 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- poldek_indexes = old dropped, only pndir generated now

---- Files affected:
pld-ftp-admin/bin:
   pfa-genindex (1.34 -> 1.35) 
pld-ftp-admin/modules:
   config.py (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: pld-ftp-admin/bin/pfa-genindex
diff -u pld-ftp-admin/bin/pfa-genindex:1.34 pld-ftp-admin/bin/pfa-genindex:1.35
--- pld-ftp-admin/bin/pfa-genindex:1.34	Tue Feb  1 21:38:29 2011
+++ pld-ftp-admin/bin/pfa-genindex	Sun Nov 11 11:23:55 2012
@@ -93,14 +93,9 @@
         print '\n-------------------------- %s --------------------------' % tree
         for arch in all_ftp_archs:
             print '\ngenerate poldek index for %s' % arch
-            if config.poldek_indexes != "old":
-                os.system('%s -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pndir' % (poldek, ftp_dir, tree, arch))
-                if arch != 'noarch' and config.separate_debuginfo:
-                    os.system('%s -s %s%s/%s/debuginfo/ --mkidxz --mkidx-type pndir' % (poldek, ftp_dir, tree, arch))
-            if config.poldek_indexes != "new":
-                os.system('%s -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pdir' % (poldek, ftp_dir, tree, arch))
-                if arch != 'noarch' and config.separate_debuginfo:
-                    os.system('%s -s %s%s/%s/debuginfo/ --mkidxz --mkidx-type pdir' % (poldek, ftp_dir, tree, arch))
+            os.system('%s -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pndir' % (poldek, ftp_dir, tree, arch))
+            if arch != 'noarch' and config.separate_debuginfo:
+                os.system('%s -s %s%s/%s/debuginfo/ --mkidxz --mkidx-type pndir' % (poldek, ftp_dir, tree, arch))
 
 if do_yum:
     os.system('%s cd %s.stat/repodata && cvs %s up comps.xml' % ("" if quiet else "set -x;", ftp_dir, "" if quiet else "-Q"))

================================================================
Index: pld-ftp-admin/modules/config.py
diff -u pld-ftp-admin/modules/config.py:1.17 pld-ftp-admin/modules/config.py:1.18
--- pld-ftp-admin/modules/config.py:1.17	Tue Aug  7 11:54:52 2012
+++ pld-ftp-admin/modules/config.py	Sun Nov 11 11:23:55 2012
@@ -55,11 +55,6 @@
 else:
     old_poldek = False
 
-if 'poldek_indexes' in value:
-    poldek_indexes = value['poldek_indexes']
-else:
-    poldek_indexes = 'old'
-
 if value['separate_noarch'] == 'yes':
     separate_noarch = True
 else:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/bin/pfa-genindex?r1=1.34&r2=1.35
    http://cvs.pld-linux.org/pld-ftp-admin/modules/config.py?r1=1.17&r2=1.18