extras-buildsys/utils/pushscript RepoView.py,1.6,1.7

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29815

Modified Files:
	RepoView.py 
Log Message:
- update for 'development' repo layout
- append std pushscript module main function




Index: RepoView.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RepoView.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RepoView.py	12 Apr 2007 20:41:41 -0000	1.6
+++ RepoView.py	6 Nov 2008 12:10:46 -0000	1.7
@@ -18,11 +18,14 @@
 import errno, os, sys
 import Utils
 
-def do_repoview(cfg,repodir,title,sources=False):
+def do_repoview(cfg,dist,repodir,title,sources=False):
     print 'Generating repoview in %s' % repodir
     # This option requires a modified repoview script!
     if sources:
-        srcpath = '-s ../../SRPMS'
+        if dist == 'development':  # hack for rawhide/releases repo path scheme
+            srcpath = '-s ../../../source/SRPMS'
+        else:
+            srcpath = '-s ../../SRPMS'
     else:
         srcpath = ''
     cmd = '%s -t \"%s\" %s %s' % (cfg.repoview,title,srcpath,repodir)
@@ -30,24 +33,20 @@
 
 
 def main(cfg,dist):
-    if not cfg.archdict.has_key(dist):
-        print "No distribution release named '%s' found" % dist
-        sys.exit(errno.EINVAL)
-    
-    destdir = os.path.join(cfg.treedir, dist)
     title = cfg.project_hr+' %s Source RPM Packages'%dist
-    do_repoview(cfg,os.path.join(destdir, 'SRPMS'),title)
+    repodir = Utils.srpm_repodir(cfg,dist)
+    do_repoview(cfg,dist,repodir,title)
 
     # arch repo creation
     for arch in cfg.archdict[dist]:
-        repodir = os.path.join(destdir, arch)
         title = cfg.project_hr+' %s (%s)'%(dist,arch)
-        do_repoview(cfg,repodir,title,True)
+        repodir = Utils.rpm_repodir(cfg,dist,arch)
+        do_repoview(cfg,dist,repodir,title,True)
 
 
 if __name__ == '__main__':
     if len(sys.argv) < 3:
-        print 'Usage: %s <project> <release>\n' % os.path.basename(sys.argv[0])
+        print 'Usage: %s <project> <release> [release]...\n' % os.path.basename(sys.argv[0])
         sys.exit(errno.EINVAL)
     
     cfg = Utils.load_config_module(sys.argv[1])
@@ -55,5 +54,9 @@
     me = os.getcwd()
     Utils.signer_gid_check(cfg.signersgid)
     os.umask(cfg.signersumask)
-    main(cfg,sys.argv[2])
+    for dist in sys.argv[2:]:
+        if not cfg.archdict.has_key(dist):
+            print "No distribution release named '%s' found" % dist
+            continue
+        main(cfg,dist)
     os.chdir(me)