[svn] r5533 - trunk/tools/mrepo

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-06-22 00:25:18 +0200 (Fri, 22 Jun 2007)
New Revision: 5533

Modified:
   trunk/tools/mrepo/ChangeLog
   trunk/tools/mrepo/mrepo
Log:
Fixed RPM links from a file:/// source (Gabe Johnson)

Modified: trunk/tools/mrepo/ChangeLog
===================================================================
--- trunk/tools/mrepo/ChangeLog	2007-06-20 15:39:03 UTC (rev 5532)
+++ trunk/tools/mrepo/ChangeLog	2007-06-21 22:25:18 UTC (rev 5533)
@@ -12,6 +12,7 @@
 - Check for directory when creating before symlinking into it (Bruno Cornec)
 - Allow the RHN/up2date code to live in /usr/share/mrepo/rhn/ (Frederic Pica)
 - Added arch ia32e as alias for x86_64
+- Fixed RPM links from a file:/// source (Gabe Johnson)
 
 * 0.8.4 - Sint-Jacobsplein - released 13/12/2006
 - Renamed Yam to mrepo (Matthew Hannigan)

Modified: trunk/tools/mrepo/mrepo
===================================================================
--- trunk/tools/mrepo/mrepo	2007-06-20 15:39:03 UTC (rev 5532)
+++ trunk/tools/mrepo/mrepo	2007-06-21 22:25:18 UTC (rev 5533)
@@ -1264,12 +1264,12 @@
     if archs.has_key(dist.arch):
         archlist.extend(archs[dist.arch])
     else:
-        archlist.extend(dist.arch)
+        archlist.append(dist.arch)
     for arch in archlist:
         regexp = re.compile('.+[\._-]' + arch + '\.rpm$')
         for file in filelist:
             src = os.path.join(dirpath, file)
-            if os.path.islink(src):
+            if os.path.islink(src) and os.path.isdir(src):
                 os.path.walk(src, rpmlink, (dist, repo))
             elif regexp.match(file, 1):
                 symlink(src, os.path.join(dist.dir, 'RPMS.' + repo))