[svn] r4784 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-10-01 14:29:39 +0200 (Sun, 01 Oct 2006)
New Revision: 4784

Modified:
   trunk/tools/yam/yam
Log:
Small fixes

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-09-30 16:58:56 UTC (rev 4783)
+++ trunk/tools/yam/yam	2006-10-01 12:29:39 UTC (rev 4784)
@@ -791,10 +791,10 @@
 			ret = run('%s %s --title="%s" %s' % (cf.cmd['repoview'], opts, title, self.wwwdir))
 			if 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(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(YamGenerateException('%s failed with return code: %s' % (cf.cmd['repoview'], ret)))
 
 class Set:
 	def __init__(self):
@@ -1302,6 +1302,9 @@
 	except xmlrpclib.Fault, f:
 		raise(YamMirrorException('Problem setting up XML communication for channel %s.\n%s' % (label, f.faultString)))
 		return
+	except up2dateErrors.ServerCapabilityError, f:
+		raise(YamMirrorException('Problem negotiating capabilities for channel %s.\n%s' % (label, f.faultString)))
+		return
 	try:
 		if cf.rhndownloadall == True:
 			package_list, type = rpcServer.doCall(repos.listAllPackages, channel, None, None)