extras-buildsys/utils/pushscript ToStable.py,1.8,1.9

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	ToStable.py 
Log Message:
- don't accept "development" dist / other invalid dists
- update for changed/new repo path helpers



Index: ToStable.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/ToStable.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ToStable.py	29 Sep 2008 15:54:07 -0000	1.8
+++ ToStable.py	6 Nov 2008 12:21:30 -0000	1.9
@@ -87,10 +87,14 @@
     srcdist = 'testing/%s' % dist
     destdist = dist
 
-    srcdir = os.path.join(cfg.treedir,srcdist,'SRPMS')
+    if srcdist not in cfg.alldists:
+        print "No distribution release named '%s' found" % srcdist
+        return
+    
+    srcdir = Utils.srpm_repodir(cfg,srcdist)
     binrepos = []
     for arch in cfg.archdict[srcdist]:  # list of repo archs
-        binrepos.append( (arch,os.path.join(cfg.treedir,srcdist,arch)) )
+        binrepos.append( (arch,Utils.rpm_repodir(cfg,srcdist,arch)) )
     pkgsets = getPackageSets(srcdir,binrepos)
 
     buildreport = BuildReportManager(cfg.rundir,dist)
@@ -122,9 +126,9 @@
                 for f in rpms:
                     basename = os.path.basename(f)
                     if basename.find('-debuginfo-')>0:
-                        destpath = os.path.join(cfg.treedir,destdist,repoarch,'debug',basename)
+                        destpath = os.path.join( Utils.debug_repodir(cfg,destdist,repoarch), basename )
                     else:
-                        destpath = os.path.join(cfg.treedir,destdist,repoarch,basename)
+                        destpath = os.path.join( Utils.rpm_repodir(cfg,destdist,repoarch), basename )
                     print '     ',basename,'->',repoarch
                     Utils.install_move(f,destpath)