[svn] r4744 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-09-19 10:05:16 +0200 (Tue, 19 Sep 2006)
New Revision: 4744

Modified:
   trunk/tools/yam/yam
Log:
Revert the groupfile change, sigh...

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-09-19 07:18:10 UTC (rev 4743)
+++ trunk/tools/yam/yam	2006-09-19 08:05:16 UTC (rev 4744)
@@ -640,11 +640,11 @@
 			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 "comps.xml"'
+				repoopts = repoopts + ' --groupfile "RPMS.%s/comps.xml"' % self.name
 			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:
-				raise(YamMirrorException('%s failed with return code: %s' % (cf.cmd['createrepo'], ret)))
+				raise(YamGenerateException('%s failed with return code: %s' % (cf.cmd['createrepo'], ret)))
 
 	def yum(self):
 		"Create a (old-style) yum repository"
@@ -665,7 +665,7 @@
 			info(2, '%s: Create (old-style) yum repository for %s' % (self.dist.nick, self.name))
 			ret = run('%s %s -l %s' % (cf.cmd['yumarch'], opts, self.wwwdir))
 			if ret:
-				raise(YamMirrorException('%s failed with return code: %s' % (cf.cmd['yumarch'], ret)))
+				raise(YamGenerateException('%s failed with return code: %s' % (cf.cmd['yumarch'], ret)))
 
 	def apt(self):
 		"Create an (old-style) apt repository"
@@ -711,7 +711,7 @@
 #		else:
 		ret = run('%s %s --flat --bloat --bz2only --partial %s %s' % (cf.cmd['genbasedir'], opts, self.dist.dir, self.name))
 		if ret:
-			raise(YamMirrorException('%s failed with return code: %s' % (cf.cmd['genbasedir'], ret)))
+			raise(YamGenerateException('%s failed with return code: %s' % (cf.cmd['genbasedir'], ret)))
 
 	def repoview(self):
 		"Create a repoview index"
@@ -729,11 +729,11 @@
 			title = '%s repository for %s' % (self.name, self.dist.nick)
 			ret = run('%s %s --title="%s" %s' % (cf.cmd['repoview'], opts, title, self.wwwdir))
 			if ret:
-				raise(YamMirrorException('%s failed with return code: %s' % (cf.cmd['repoview'], ret)))
+				raise(YamGenerateException('%s failed with return code: %s' % (cf.cmd['repoview'], ret)))
 			url = 'http://yam/%s/RPMS.%s/' % (self.dist.nick, self.name)
 			ret = run('%s %s --url="%s" %s' % (cf.cmd['repoview'], opts, url, self.wwwdir))
 			if ret:
-				raise(YamMirrorException('%s failed with return code: %s' % (cf.cmd['repoview'], ret)))
+				raise(YamGenerateException('%s failed with return code: %s' % (cf.cmd['repoview'], ret)))
 
 class YamMirrorException(Exception):
 	def __init__(self, value):