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

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-09-19 05:35:23 +0200 (Tue, 19 Sep 2006)
New Revision: 4740

Modified:
   trunk/tools/yam/TODO
   trunk/tools/yam/config/dists/centos4.conf
   trunk/tools/yam/yam
Log:
Updates

Modified: trunk/tools/yam/TODO
===================================================================
--- trunk/tools/yam/TODO	2006-09-18 22:08:32 UTC (rev 4739)
+++ trunk/tools/yam/TODO	2006-09-19 03:35:23 UTC (rev 4740)
@@ -48,7 +48,6 @@
 
 ### Usability
 + Create information about repository-updates in HEADER.shtml/README.shtml
-+ Generate sample yum.conf and apt .list files for people to use
 + Add selinux support
 
 ### Web front-end

Modified: trunk/tools/yam/config/dists/centos4.conf
===================================================================
--- trunk/tools/yam/config/dists/centos4.conf	2006-09-18 22:08:32 UTC (rev 4739)
+++ trunk/tools/yam/config/dists/centos4.conf	2006-09-19 03:35:23 UTC (rev 4740)
@@ -3,14 +3,14 @@
 
 [centos4]
 name = CentOS $release ($arch)
-release = 4.3
+release = 4
 #arch = i386 x86_64 ia64 s390 s390x alpha
 arch = i386
 metadata = repomd
 
 ### ISO images
 iso = http://mirror.centos.org/pub/centos/$release/isos/$arch/CentOS-$release-$arch-bin?of4.iso
-#os = http://mirror.centos.org/centos/$release/os/$arch/RPMS/
+#os = http://mirror.centos.org/centos/$release/os/$arch/CentOS/RPMS/
 
 ### Additional repositories
 updates = http://mirror.centos.org/centos/$release/updates/$arch/RPMS/

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-09-18 22:08:32 UTC (rev 4739)
+++ trunk/tools/yam/yam	2006-09-19 03:35:23 UTC (rev 4740)
@@ -644,7 +644,7 @@
 			groupfile = os.path.join(cf.srcdir, self.dist.nick, self.name + '-comps.xml')
 			if os.path.isfile(groupfile):
 				symlink(groupfile, os.path.join(self.wwwdir, 'comps.xml'))
-				repoopts = repoopts + ' --groupfile "RPMS.%s/comps.xml"' % self.name
+				repoopts = repoopts + ' --groupfile "comps.xml"'
 			info(2, '%s: Create repomd repository for %s' % (self.dist.nick, self.name))
 			ret = run('%s %s %s' % (cf.cmd['createrepo'], repoopts, self.wwwdir))
 			if ret:
@@ -697,7 +697,7 @@
 				% (os.uname()[1], self.dist.name, self.dist.nick, self.dist.arch, self.dist.name))
 
 		### Write out /srcdir/nick/base/release.repo
-		releasefile = os.path.join(self.dir, 'base', 'release.'+ repo)
+		releasefile = os.path.join(self.dist.dir, 'base', 'release.'+ self.name)
 		if not os.path.exists(releasefile):
 			open(releasefile, 'w').write(
 				'Archive: %s\n'\