- add options --nopoldek and --noyum

Changed files:
    bin/pfa-genindex -> 1.16

diff --git a/bin/pfa-genindex b/bin/pfa-genindex
index 95f51ab9e44ab3b40f84f0e3a599d094ac683933..c89f66b9ff516e9d82199210870d5c498731684d 100644 (file)
--- a/bin/pfa-genindex
+++ b/bin/pfa-genindex
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
+import getopt
 import sys, os
 sys.path.insert(0, os.environ['HOME']+'/pld-ftp-admin/modules')
 from common import checkdir
@@ -8,12 +9,27 @@ from config import ftp_dir,all_ftp_archs
 import config
 import ftpio
 
-if len(sys.argv) < 2:
+try:
+    opts, args = getopt.getopt(sys.argv[1:], None, ["nopoldek", "noyum"])
+except getopt.GetoptError:
     print "ERR: not enough parameters given"
-    print "gen-indexes.py tree [tree2...]"
+    print "gen-indexes.py [--nopoldek] [--noyum] tree [tree2...]"
     sys.exit(1)
 
-trees=sys.argv[1:]
+do_poldek = True
+do_yum = True
+
+for o, a in opts:
+    if o == "--nopoldek":
+        do_poldek = False
+    if o == "--noyum":
+        do_yum = False
+
+if not do_poldek and not do_yum:
+    print "ERR: option --nopoldek conflicts with --noyum"
+    sys.exit(1)
+
+trees=args
 
 for tree in trees:
     checkdir(tree)
@@ -35,27 +51,30 @@ home=os.environ['HOME']
 
 os.umask(022)
 
-for tree in trees:
-    print '-------------------------- %s --------------------------' % tree
-    for arch in all_ftp_archs:
-        print 'ARCHITECTURE: %s' % arch
-        if config.old_poldek:
-            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:
-            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:
-    print '-------------------------- %s --------------------------' % tree
-    for arch in all_ftp_archs:
-        print 'ARCHITECTURE: %s' % arch
-        # Creating indexes for yum and other supporting xml repodata.
-        os.system('%s.stat/bin/createrepo --cache %s/tmp/createrepo/%s-%s %s%s/%s/RPMS' %
-                (ftp_dir,home,tree,arch,ftp_dir,tree,arch))
+if do_poldek:
+    for tree in trees:
+        print '-------------------------- %s --------------------------' % tree
+        for arch in all_ftp_archs:
+            print 'ARCHITECTURE: %s' % arch
+            if config.old_poldek:
+                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:
+                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))
+
+if do_yum:
+    for tree in trees:
+        print '-------------------------- %s --------------------------' % tree
+        for arch in all_ftp_archs:
+            print 'ARCHITECTURE: %s' % arch
+            # Creating indexes for yum and other supporting xml repodata.
+            os.system('%s.stat/bin/createrepo --cache %s/tmp/createrepo/%s-%s %s%s/%s/RPMS' %
+                    (ftp_dir,home,tree,arch,ftp_dir,tree,arch))
 
 for tree in trees:
     ftpio.unlock(tree)