pld-ftp-admin: modules/config.py, scripts/gen-indexes.py - also su...

[mmazur]

Author: mmazur                       Date: Thu Jul 14 23:56:42 2005 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- also support older poldek

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

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/config.py
diff -u pld-ftp-admin/modules/config.py:1.6 pld-ftp-admin/modules/config.py:1.7
--- pld-ftp-admin/modules/config.py:1.6	Thu Jul 14 21:34:32 2005
+++ pld-ftp-admin/modules/config.py	Fri Jul 15 01:56:37 2005
@@ -30,6 +30,11 @@
 
 builderqueue=value['builderqueue']
 
+if 'old_poldek' in value and value['old_poldek']=='yes':
+    old_poldek=True
+else:
+    old_poldek=False
+
 if value['separate_noarch']=='yes':
     separate_noarch=True
 else:

================================================================
Index: pld-ftp-admin/scripts/gen-indexes.py
diff -u pld-ftp-admin/scripts/gen-indexes.py:1.6 pld-ftp-admin/scripts/gen-indexes.py:1.7
--- pld-ftp-admin/scripts/gen-indexes.py:1.6	Tue Jun 21 00:27:06 2005
+++ pld-ftp-admin/scripts/gen-indexes.py	Fri Jul 15 01:56:37 2005
@@ -5,6 +5,7 @@
 sys.path.insert(0, os.environ['HOME']+'/pld-ftp-admin/modules')
 from common import checkdir
 from config import ftp_dir,all_ftp_archs
+import config
 import ftpio
 
 if len(sys.argv) < 2:
@@ -36,7 +37,11 @@
     print '-------------------------- %s --------------------------' % tree
     for arch in all_ftp_archs:
         print 'ARCHITECTURE: %s' % arch
-        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' %
+        if config.old_poldek:
+            os.system('%s.stat/bin/poldek --cachedir=%s/tmp/poldek -c %.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))
 
 for tree in trees:
================================================================

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