[svn] r4857 - in trunk/tools/yam: . config/dists

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Sun Oct 29 21:54:53 CET 2006 

Author: dag
Date: 2006-10-29 21:54:51 +0100 (Sun, 29 Oct 2006)
New Revision: 4857

Added:
   trunk/tools/yam/config/dists/fc6.conf
Modified:
   trunk/tools/yam/ChangeLog
   trunk/tools/yam/config/dists/centos3.conf
   trunk/tools/yam/config/dists/centos4.conf
   trunk/tools/yam/config/dists/fc3.conf
   trunk/tools/yam/config/dists/fc4.conf
   trunk/tools/yam/config/dists/fc5.conf
   trunk/tools/yam/config/dists/rh7.3.conf
   trunk/tools/yam/config/dists/rhel3as-i386.conf
   trunk/tools/yam/config/dists/rhel3as-x86_64.conf
   trunk/tools/yam/config/dists/rhel4as.conf
   trunk/tools/yam/yam
Log:
Updates

Modified: trunk/tools/yam/ChangeLog
===================================================================
--- trunk/tools/yam/ChangeLog	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/ChangeLog	2006-10-29 20:54:51 UTC (rev 4857)
@@ -1,6 +1,8 @@
 * 0.8.3svn - ... - released 22/10/2006
 - Fix a bug in the relpath() function when common part is not a path (Jason Kim)
 - Do not copy the comps.xml from the ISO when the target os-comps.xml exists (Jason Kim)
+- Fixed a problem when locking during a dry-run (David Lutterkort)
+- Improved a lot of dist configs
 
 * 0.8.3 - Van Eyck - released 15/10/2006
 - Fixed a problem with specific python versions (Justin B Hochstetler)

Modified: trunk/tools/yam/config/dists/centos3.conf
===================================================================
--- trunk/tools/yam/config/dists/centos3.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/centos3.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -3,7 +3,7 @@
 
 [centos3]
 name = CentOS $release ($arch)
-release = 3.7
+release = 3.8
 #arch = i386 x86_64 ia64 s390 s390x
 arch = i386
 metadata = repomd yum repoview
@@ -26,5 +26,11 @@
 rpmforge = rsync://apt.sw.be/pub/freshrpms/pub/dag/redhat/el3/en/$arch/RPMS.dag/
 #rpmforge = http://apt.sw.be/redhat/el3/en/$arch/RPMS.dag/
 
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/el$release-$arch/atrpms/stable/
+
+### PostgreSQL repository
+#postgresql = ftp://ftp.fr.postgresql.org/binary/v8.1.4/linux/rpms/redhat/rhel-as-$release-$arch/
+
 ### Custom repository for your own RPM packages
 custom =

Modified: trunk/tools/yam/config/dists/centos4.conf
===================================================================
--- trunk/tools/yam/config/dists/centos4.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/centos4.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -24,12 +24,19 @@
 
 ### RPMforge repository
 rpmforge = rsync://apt.sw.be/pub/freshrpms/pub/dag/redhat/el4/en/$arch/RPMS.dag/
+#rpmforge = ftp://apt.sw.be/pub/dag/pub/redhat/el4/en/$arch/RPMS.dag/
 #rpmforge = http://apt.sw.be/redhat/el4/en/$arch/RPMS.dag/
 
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/el$release-$arch/atrpms/stable/
+
 ### OpenVZ repositories
 #ovzkernel = http://download.openvz.org/kernel/rhel4/
 #ovztemplate = http://download.openvz.org/template/
 #ovzutils = http://download.openvz.org/utils/
 
+### PostgreSQL repository
+#postgresql = ftp://ftp.fr.postgresql.org/binary/v8.1.4/linux/rpms/redhat/rhel-as-$release-$arch/
+
 ### Custom repository for your own RPM packages
 custom =

Modified: trunk/tools/yam/config/dists/fc3.conf
===================================================================
--- trunk/tools/yam/config/dists/fc3.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/fc3.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -20,3 +20,9 @@
 
 ### FreshRPMS repository
 freshrpms = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/fedora/linux/$release/$arch/RPMS.$repo/
+
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/fc$release-$arch/atrpms/stable/
+
+### Livna repository
+#livna = http://rpm.livna.org/fedora/$release/$arch/

Modified: trunk/tools/yam/config/dists/fc4.conf
===================================================================
--- trunk/tools/yam/config/dists/fc4.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/fc4.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -22,3 +22,9 @@
 
 ### NewRPMS repository
 #newrpms = rsync://newrpms.sunsite.dk/projects/newrpms/www/htdocs/apt/redhat/en/$arch/fc$release/RPMS.$repo/
+
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/fc$release-$arch/atrpms/stable/
+
+### Livna repository
+#livna = http://rpm.livna.org/fedora/$release/$arch/

Modified: trunk/tools/yam/config/dists/fc5.conf
===================================================================
--- trunk/tools/yam/config/dists/fc5.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/fc5.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -23,3 +23,9 @@
 
 ### FreshRPMS repository
 freshrpms = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/fedora/linux/$release/$arch/RPMS.$repo/
+
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/fc$release-$arch/atrpms/stable/
+
+### Livna repository
+#livna = http://rpm.livna.org/fedora/$release/$arch/

Added: trunk/tools/yam/config/dists/fc6.conf
===================================================================
--- trunk/tools/yam/config/dists/fc6.conf	                        (rev 0)
+++ trunk/tools/yam/config/dists/fc6.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -0,0 +1,31 @@
+### Name: Fedora Core v6
+### URL: http://fedora.redhat.com/
+
+[fc6]
+name = Fedora Core $release ($arch)
+release = 6
+#arch = i386 x86_64 ppc
+arch = i386
+metadata = repomd repoview
+
+### ISO images
+iso = http://download.fedora.redhat.com/pub/fedora/linux/core/$version/$arch/iso/FC-$version-$arch-disc?.iso
+os = http://download.fedora.redhat.com/pub/fedora/linux/core/$version/$arch/os/Fedora/RPMS/
+
+### Additional repositories
+updates = http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$version/$arch/
+extras = http://download.fedora.redhat.com/pub/fedora/linux/extras/$version/$arch/
+
+### RPMforge repository
+rpmforge = rsync://apt.sw.be/pub/freshrpms/pub/dag/fedora/$release/en/$arch/dries/RPMS/
+#rpmforge = ftp://apt.sw.be/pub/dag/pub/fedora/$release/en/$arch/dries/RPMS/
+#rpmforge = http://apt.sw.be/fedora/$release/en/$arch/dries/RPMS/
+
+### FreshRPMS repository
+freshrpms = rsync://ayo.freshrpms.net/pub/freshrpms/pub/freshrpms/ayo/fedora/linux/$release/$arch/RPMS.$repo/
+
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/fc$release-$arch/atrpms/stable/
+
+### Livna repository
+#livna = http://rpm.livna.org/fedora/$release/$arch/

Modified: trunk/tools/yam/config/dists/rh7.3.conf
===================================================================
--- trunk/tools/yam/config/dists/rh7.3.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/rh7.3.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -20,3 +20,6 @@
 
 ### FreshRPMS repository
 freshrpms = rsync://rsync.freshrpms.net/freshrpms/ayo/redhat/$release/$arch/RPMS.$repo/
+
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/rh$release-$arch/atrpms/stable/

Modified: trunk/tools/yam/config/dists/rhel3as-i386.conf
===================================================================
--- trunk/tools/yam/config/dists/rhel3as-i386.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/rhel3as-i386.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -28,5 +28,11 @@
 #rpmforge = ftp://apt.sw.be/pub/dag/pub/redhat/el$release/en/$arch/RPMS.dag/
 #rpmforge = http://apt.sw.be/redhat/el$release/en/$arch/RPMS.dag/
 
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/el$release-$arch/atrpms/stable/
+
+### PostgreSQL repository
+#postgresql = ftp://ftp.fr.postgresql.org/binary/v8.1.4/linux/rpms/redhat/rhel-as-$release-$arch/
+
 ### Custom repository for your own RPM packages
 custom =

Modified: trunk/tools/yam/config/dists/rhel3as-x86_64.conf
===================================================================
--- trunk/tools/yam/config/dists/rhel3as-x86_64.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/rhel3as-x86_64.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -26,5 +26,11 @@
 #rpmforge = ftp://apt.sw.be/pub/dag/pub/redhat/el$release/en/$arch/RPMS.dag/
 #rpmforge = http://apt.sw.be/redhat/el$release/en/$arch/RPMS.dag/
 
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/el$release-$arch/atrpms/stable/
+
+### PostgreSQL repository
+#postgresql = ftp://ftp.fr.postgresql.org/binary/v8.1.4/linux/rpms/redhat/rhel-as-$release-$arch/
+
 ### Custom repository for your own RPM packages
 custom =

Modified: trunk/tools/yam/config/dists/rhel4as.conf
===================================================================
--- trunk/tools/yam/config/dists/rhel4as.conf	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/config/dists/rhel4as.conf	2006-10-29 20:54:51 UTC (rev 4857)
@@ -9,7 +9,7 @@
 metadata = repomd yum repoview
 
 ### ISO images
-#iso = RHEL$release-U3-$arch-AS-disc?.iso
+#iso = RHEL$release-U4-$arch-AS-disc?.iso
 
 ### Additional repositories
 updates = rhns:///rhel-$arch-as-4
@@ -30,10 +30,19 @@
 #rpmforge = ftp://apt.sw.be/pub/dag/pub/redhat/el$release/en/$arch/RPMS.dag/
 #rpmforge = http://apt.sw.be/redhat/el$release/en/$arch/RPMS.dag/
 
+### ATrpms repository
+#atrpms-stable = rsync://dl.atrpms.net/dl.atrpms.net/el$release-$arch/atrpms/stable/
+
+### Livna repository
+#livna = http://rpm.livna.org/fedora/6/i386/
+
 ### OpenVZ repositories
 #ovzkernel = http://download.openvz.org/kernel/rhel4/
 #ovztemplate = http://download.openvz.org/template/
 #ovzutils = http://download.openvz.org/utils/
 
+### PostgreSQL repository
+#postgresql = ftp://ftp.fr.postgresql.org/binary/v8.1.4/linux/rpms/redhat/rhel-as-$release-$arch/
+
 ### Custom repository for your own RPM packages
 custom =

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-10-24 15:20:22 UTC (rev 4856)
+++ trunk/tools/yam/yam	2006-10-29 20:54:51 UTC (rev 4857)
@@ -617,6 +617,8 @@
 				info(1, '%s: Directory changed during generating %s repo, please generate again.' % (self.dist.nick, self.name))
 
 	def lock(self, action):
+		if op.dryrun:
+			return True
 		lockfile = os.path.join(cf.lockdir, self.dist.nick, action + '-' + self.name + '.lock')
 		mkdir(os.path.dirname(lockfile))
 		try:
@@ -636,10 +638,12 @@
 					self.lock(action)
 					return True
 			else:
-				error(0, '%s: Lockfile %s does not exist. Cannot lock. Parallel universe ?' % (self.nick, lockfile))
+				error(0, '%s: Lockfile %s does not exist. Cannot lock. Parallel universe ?' % (self.dist.nick, lockfile))
 		return False
 
 	def unlock(self, action):
+		if op.dryrun:
+			return True
 		lockfile = os.path.join(cf.lockdir, self.dist.nick, action + '-' + self.name + '.lock')
 		info(6, '%s: Removing lock %s' % (self.dist.nick, lockfile))
 		if os.path.exists(lockfile):

More information about the svn-commits mailing list