[svn] r4749 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-09-21 00:18:45 +0200 (Thu, 21 Sep 2006)
New Revision: 4749

Modified:
   trunk/tools/yam/yam
Log:
Fix reported by Justin B Hochstetler

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-09-20 20:38:52 UTC (rev 4748)
+++ trunk/tools/yam/yam	2006-09-20 22:18:45 UTC (rev 4749)
@@ -258,7 +258,7 @@
 
 				### Add a distribution for each arch
 				for arch in archlist:
-					dist = Dist(self.srcdir, self.wwwdir, distname, arch)
+					dist = Dist(distname, arch)
 					self.dists.append(dist)
 					dist.arch = arch
 					dist.metadata = self.metadata.split()
@@ -291,7 +291,7 @@
 		return var
 
 class Dist:
-	def __init__(self, srcdir, wwwdir, dist, arch):
+	def __init__(self, dist, arch):
 		global cf
 
 		self.arch = arch
@@ -300,12 +300,12 @@
 		if arch == 'none':
 			self.nick = dist
 		self.name = dist
-		self.dir = os.path.join(wwwdir, self.nick)
+		self.dir = os.path.join(cf.wwwdir, self.nick)
 		self.iso = None
 		self.release = None
 		self.repos = []
 		self.rhnrelease = None
-		self.srcdir = srcdir
+		self.srcdir = cf.srcdir
 		self.discs = ()
 		self.isos = []
 
@@ -478,6 +478,8 @@
 
 class Repo:
 	def __init__(self, name, url, dist):
+		global cf
+
 		self.name = name
 		self.url = url
 		self.dist = dist
@@ -1178,7 +1180,7 @@
 
 	from up2date_client import rpcServer, wrapperUtils, up2dateErrors, repoDirector
 	from rhn import rpclib
-	import signal
+	import signal, xmlrpclib
 
 	### Log on to RHN
 	systemid = rhnlogin(url, path, dist)