[svn] r5386 - trunk/tools/mrepo

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri May 11 12:03:58 CEST 2007


Author: dag
Date: 2007-05-11 12:03:56 +0200 (Fri, 11 May 2007)
New Revision: 5386

Modified:
   trunk/tools/mrepo/ChangeLog
   trunk/tools/mrepo/mrepo
Log:
Two fixes from Tom G. Christensen.

Modified: trunk/tools/mrepo/ChangeLog
===================================================================
--- trunk/tools/mrepo/ChangeLog	2007-05-10 14:07:24 UTC (rev 5385)
+++ trunk/tools/mrepo/ChangeLog	2007-05-11 10:03:56 UTC (rev 5386)
@@ -7,6 +7,8 @@
 - rhnget can now --list and --filter packages (useful for searching/downloading)
 - Added 5Server and 5Client products to gensystemid (Oliver Falk)
 - Added rhel5s.conf and rhel5c.conf (Oliver Falk)
+- Added amd64 as alias for x86_64 to accomodate Sun's Java packages (Tom G. Christensen)
+- Option -f/--force now rewrites apt release files (Tom G. Christensen)
 
 * 0.8.4 - Sint-Jacobsplein - released 13/12/2006
 - Renamed Yam to mrepo (Matthew Hannigan)

Modified: trunk/tools/mrepo/mrepo
===================================================================
--- trunk/tools/mrepo/mrepo	2007-05-10 14:07:24 UTC (rev 5385)
+++ trunk/tools/mrepo/mrepo	2007-05-11 10:03:56 UTC (rev 5386)
@@ -28,7 +28,7 @@
 	'i386': ('i386', 'i486', 'i586', 'i686', 'athlon'),
 	'ia64': ('i386', 'i686', 'ia64'),
 	'ppc': ('ppc', 'ppc64', 'ppc64pseries', 'ppc64iseries'),
-	'x86_64': ('i386', 'i486', 'i586', 'i686', 'athlon', 'x86_64'),
+	'x86_64': ('i386', 'i486', 'i586', 'i686', 'athlon', 'x86_64', 'amd64'),
 	's390': ('s390', ),
 	's390x': ('s390x', ),
 }
@@ -754,7 +754,7 @@
 
 		### Write out /srcdir/nick/base/release
 		releasefile = os.path.join(self.dist.dir, 'base', 'release')
-		if not os.path.exists(releasefile):
+		if op.force or not os.path.exists(releasefile):
 			open(releasefile, 'w').write(
 				'Origin: %s\n'\
 				'Label: %s\n'\
@@ -769,7 +769,7 @@
 
 		### Write out /srcdir/nick/base/release.repo
 		releasefile = os.path.join(self.dist.dir, 'base', 'release.'+ self.name)
-		if not os.path.exists(releasefile):
+		if op.force or not os.path.exists(releasefile):
 			open(releasefile, 'w').write(
 				'Archive: %s\n'\
 				'Component: %s\n'\




More information about the commits mailing list