pld-ftp-admin: scripts/gen-indexes.py, modules/config.py - add sup...

[arekm]

Author: arekm                        Date: Fri Sep  9 10:22:20 2005 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- add support for generating only pndir indexes, both indexes and pdir only indexes using new poldek

---- Files affected:
pld-ftp-admin/scripts:
   gen-indexes.py (1.9 -> 1.10) 
pld-ftp-admin/modules:
   config.py (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: pld-ftp-admin/scripts/gen-indexes.py
diff -u pld-ftp-admin/scripts/gen-indexes.py:1.9 pld-ftp-admin/scripts/gen-indexes.py:1.10
--- pld-ftp-admin/scripts/gen-indexes.py:1.9	Thu Sep  1 22:57:38 2005
+++ pld-ftp-admin/scripts/gen-indexes.py	Fri Sep  9 12:22:15 2005
@@ -43,8 +43,12 @@
             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)

================================================================
Index: pld-ftp-admin/modules/config.py
diff -u pld-ftp-admin/modules/config.py:1.7 pld-ftp-admin/modules/config.py:1.8
--- pld-ftp-admin/modules/config.py:1.7	Fri Jul 15 01:56:37 2005
+++ pld-ftp-admin/modules/config.py	Fri Sep  9 12:22:15 2005
@@ -35,6 +35,11 @@
 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:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-ftp-admin/scripts/gen-indexes.py?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/pld-ftp-admin/modules/config.py?r1=1.7&r2=1.8&f=u