From: Mariusz Mazur <mmazur@pld-linux.org>
Date: Thu, 14 Jul 2005 23:56:37 +0000 (+0000)
Subject: - also support older poldek
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=0bf1ad60e3c066f26da1ee1f2b0a3eb0d20c4b93;p=projects%2Fpld-ftp-admin.git

- also support older poldek

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

diff --git a/bin/pfa-genindex b/bin/pfa-genindex
index 2499503..04a59b3 100644
--- a/bin/pfa-genindex
+++ b/bin/pfa-genindex
@@ -5,6 +5,7 @@ import sys, os
 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 @@ for tree in trees:
     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:
diff --git a/modules/config.py b/modules/config.py
index 949d148..6ca2f57 100644
--- a/modules/config.py
+++ b/modules/config.py
@@ -30,6 +30,11 @@ ftp_archs=value['ftp_archs'].split(' ')
 
 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: