- add support for generating only pndir indexes, both indexes and pdir only indexes...

Changed files:
    bin/pfa-genindex -> 1.10
    modules/config.py -> 1.8

diff --git a/bin/pfa-genindex b/bin/pfa-genindex
index b1c779d1dc9837d2e6d1c1391e02b148844c62d7..382bcb08d843c63178fd8111d159580cc85c46d0 100644 (file)
--- a/bin/pfa-genindex
+++ b/bin/pfa-genindex
@@ -43,8 +43,12 @@ for tree in trees:
             os.system('%s.stat/bin/poldek --cachedir=%s/tmp/poldek -c %s.stat/etc/poldek.conf -s %s%s/%s/RPMS/ --mkidxz' %
                 (ftp_dir,home,ftp_dir,ftp_dir,tree,arch))
         else:
-            os.system('%s.stat/bin/poldek --cachedir=%s/tmp/poldek --conf %s.stat/etc/poldek.conf -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pdir' %
-                (ftp_dir,home,ftp_dir,ftp_dir,tree,arch))
+            if config.poldek_indexes != "old":
+                os.system('%s.stat/bin/poldek-new --cachedir=%s/tmp/poldek --conf %s.stat/etc/poldek.conf -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pndir' %
+                        (ftp_dir,home,ftp_dir,ftp_dir,tree,arch))
+            if config.poldek_indexes != "new":
+                os.system('%s.stat/bin/poldek-new --cachedir=%s/tmp/poldek --conf %s.stat/etc/poldek.conf -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pdir' %
+                        (ftp_dir,home,ftp_dir,ftp_dir,tree,arch))
 
 for tree in trees:
     ftpio.unlock(tree)

diff --git a/modules/config.py b/modules/config.py
index 6ca2f57b3d5a289f4082bbc5f5fbb770005ac89d..10960cd4d10ee900402f5c906dbf32baf2de88f5 100644 (file)
--- a/modules/config.py
+++ b/modules/config.py
@@ -35,6 +35,11 @@ if 'old_poldek' in value and value['old_poldek']=='yes':
 else:
     old_poldek=False
 
+if 'poldek_indexes' in value:
+    poldek_indexes=value['old_poldek']
+else:
+    poldek_indexes='old'
+
 if value['separate_noarch']=='yes':
     separate_noarch=True
 else: