- poldek_indexes = old dropped, only pndir generated now

Changed files:
    bin/pfa-genindex -> 1.35
    modules/config.py -> 1.18

diff --git a/bin/pfa-genindex b/bin/pfa-genindex
index f297ce390b43fd09a2f2028772a6acd8d85df944..d976f8205e91b8a95dac17eaa005e7ccd45a05f1 100644 (file)
--- a/bin/pfa-genindex
+++ b/bin/pfa-genindex
@@ -93,14 +93,9 @@ if do_poldek:
         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"))

diff --git a/modules/config.py b/modules/config.py
index bb43f4e560a0f2f163d50a1f3e9fc72f42bf1bc0..ee32dfac8bdc58c4bc3ad333b92a111f775d6527 100644 (file)
--- a/modules/config.py
+++ b/modules/config.py
@@ -55,11 +55,6 @@ if 'old_poldek' in value and value['old_poldek'] == 'yes':
 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: