[svn] r4724 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-09-18 13:47:30 +0200 (Mon, 18 Sep 2006)
New Revision: 4724

Modified:
   trunk/tools/yam/ChangeLog
   trunk/tools/yam/yam
Log:
Updates

Modified: trunk/tools/yam/ChangeLog
===================================================================
--- trunk/tools/yam/ChangeLog	2006-09-18 11:40:30 UTC (rev 4723)
+++ trunk/tools/yam/ChangeLog	2006-09-18 11:47:30 UTC (rev 4724)
@@ -5,6 +5,7 @@
 - Added createrepo-options directive (Gareth Armstrong)
 - Added rhn-download-all directive to install all available updates from RHN
 - Removed repo 'local' as a special case, if you need it define it as 'local ='
+- Don't create the repo srcdir since it might be a symlink (Gareth Armstrong)
 
 * 0.8.1 - Long overdue - released 22/08/2006
 - Added gensystemid to installation (Ian Forde)

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-09-18 11:40:30 UTC (rev 4723)
+++ trunk/tools/yam/yam	2006-09-18 11:47:30 UTC (rev 4724)
@@ -847,6 +847,9 @@
 		except YamMirrorException, e:
 			error(2, 'Mirroring failed for %s with message:\n  %s' % (url, e.value))
 			exitcode = 2
+	else:
+		### Create directory in case no URL is given
+		mkdir(path)
 
 def mirrorrsync(url, path):
 	"Mirror everything from an rsync:// URL"
@@ -952,6 +955,8 @@
 def mirrorfile(url, path):
 	"Mirror everything from a file:// URL by symlinking"
 	dir = url.replace('file://', '')
+#	while dir.endswith('/'):
+#		dir = dir[0:-1]
 	if os.path.isdir(dir):
 		symlink(dir, path)
 #	else: ### FIXME: Only if ISO file
@@ -1279,7 +1284,6 @@
 			### Downloading things
 			for repo in repos:
 				srcdir = os.path.join(cf.srcdir, dist.nick, repo)
-				mkdir(srcdir)
 				if not dist.lock('update', repo):
 					continue
 				if repo in ('os', 'core'):