extras-buildsys/utils extras-push-all, 1.1, 1.2 extras-repobuild.py, 1.10, 1.11 extras-repoview.py, 1.1, 1.2 extras-sign-move.py, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29545

Modified Files:
	extras-push-all extras-repobuild.py extras-repoview.py 
	extras-sign-move.py 
Log Message:
Update for FE5, keep only one latest package in devel.


Index: extras-push-all
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extras-push-all	22 Jan 2006 10:51:45 -0000	1.1
+++ extras-push-all	17 Mar 2006 07:46:49 -0000	1.2
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dists="3 4 development"
+dists="3 4 5 development"
 changed=
 
 sign_move()


Index: extras-repobuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- extras-repobuild.py	21 Jan 2006 18:18:51 -0000	1.10
+++ extras-repobuild.py	17 Mar 2006 07:46:49 -0000	1.11
@@ -29,8 +29,10 @@
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 
+            '4':['ppc','x86_64', 'i386'],
+            '5':['ppc','x86_64', 'i386'],
             'development':['ppc','x86_64','i386'],
-            '4':['ppc','x86_64', 'i386']}
+            }
 ts = rpmUtils.transaction.initReadOnlyTransaction()
 
 
@@ -50,7 +52,7 @@
             sys.exit(result)
 
 
-def do_repo_stuff(repodir):
+def do_repo_stuff(repodir, keep=2):
     compspath = os.path.join(repodir, compsname)
     rpdata = os.path.join(repodir, 'repodata')
     debugprint('removing tree %s' % rpdata)
@@ -59,8 +61,8 @@
         if os.path.exists(rpdata): shutil.rmtree(rpdata)
     
     print 'processing: %s' % repodir
-    print 'Cleaning up older packages'
-    cmd = '/usr/bin/repomanage -k2 -o %s | xargs rm -f' % (repodir)
+    print 'Cleaning up older packages (keeping %d latest)' % (keep)
+    cmd = '/usr/bin/repomanage -k%d -o %s | xargs rm -f' % (keep, repodir)
     run_and_check(cmd)
         
     print 'Creating repository metadata'
@@ -92,15 +94,16 @@
         sys.exit(1)
     distdir = 'fedora-%s-extras' % dist        
     destdir = os.path.join(treedir, dist)
+    keep = (dist == 'development') and 1 or 2
 
     print "Making Repository Metadata"
 
-    do_repo_stuff(os.path.join(destdir, 'SRPMS'))
+    do_repo_stuff(os.path.join(destdir, 'SRPMS'), keep)
 
     # arch repo creation
     for arch in archdict[dist]:
         repodir = os.path.join(destdir, arch)
-        do_repo_stuff(repodir)
+        do_repo_stuff(repodir, keep)
 
 if __name__ == '__main__':
     me = os.getcwd()


Index: extras-repoview.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extras-repoview.py	21 Jan 2006 18:18:51 -0000	1.1
+++ extras-repoview.py	17 Mar 2006 07:46:49 -0000	1.2
@@ -23,8 +23,10 @@
 
 treedir = '/rpmbuild/extras/tree/extras'
 archdict = {'3':['x86_64', 'i386'], 
+            '4':['ppc','x86_64', 'i386'],
+            '5':['ppc','x86_64', 'i386'],
             'development':['ppc','x86_64','i386'],
-            '4':['ppc','x86_64', 'i386']}
+            }
 
 
 DEBUG = False


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- extras-sign-move.py	21 Jan 2006 18:18:51 -0000	1.6
+++ extras-sign-move.py	17 Mar 2006 07:46:49 -0000	1.7
@@ -36,9 +36,10 @@
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 
-            'development':['ppc','x86_64','i386'],
             '4':['ppc','x86_64', 'i386'],
-            '5':['ppc','x86_64', 'i386']}
+            '5':['ppc','x86_64', 'i386'],
+            'development':['ppc','x86_64','i386'],
+            }
 ts = rpmUtils.transaction.initReadOnlyTransaction()