[svn] r4844 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-10-22 00:52:01 +0200 (Sun, 22 Oct 2006)
New Revision: 4844

Modified:
   trunk/tools/yam/ChangeLog
   trunk/tools/yam/yam
Log:
Bugfixes from Jason Kim

Modified: trunk/tools/yam/ChangeLog
===================================================================
--- trunk/tools/yam/ChangeLog	2006-10-21 13:55:26 UTC (rev 4843)
+++ trunk/tools/yam/ChangeLog	2006-10-21 22:52:01 UTC (rev 4844)
@@ -1,3 +1,7 @@
+* 0.8.4 - ... - released 22/10/2006
+- Fix a bug in the relpath() function when common part is not a path (Jason Kim)
+- Do not copy the comps.xml from the ISO when the target os-comps.xml exists (Jason Kim)
+
 * 0.8.3 - Van Eyck - released 15/10/2006
 - Fixed a problem with specific python versions (Justin B Hochstetler)
 - Fixed the non-functional -r option

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-10-21 13:55:26 UTC (rev 4843)
+++ trunk/tools/yam/yam	2006-10-21 22:52:01 UTC (rev 4844)
@@ -939,8 +939,9 @@
 	return os.path.normpath(os.path.join(path, reference))
 
 def relpath(path, reference):
-	"Make relative symlink from reference"
+	"Make relative path from reference"
 	common = os.path.commonprefix([path, reference])
+	common = common[0:common.rfind('/')+1]
 	(uncommon, targetName) = os.path.split(reference.replace(common, '', 1))
 	if uncommon:
 		newpath = []
@@ -1393,7 +1394,8 @@
 				for disc in dist.discs:
 					repo.link(os.path.join(dist.dir, disc))
 				for file in glob.glob(os.path.join(dist.dir + '/disc1/*/base/comps.xml')):
-					copy(file, os.path.join(cf.srcdir, dist.nick, 'os-comps.xml'))
+					if not os.path.exists(os.path.join(cf.srcdir, dist.nick, 'os-comps.xml')):
+						copy(file, os.path.join(cf.srcdir, dist.nick, 'os-comps.xml'))
 			repo.linkall()
 			repo.link()