[svn] r6039 - trunk/tools/mrepo

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-12-10 13:28:02 +0100 (Mon, 10 Dec 2007)
New Revision: 6039

Modified:
   trunk/tools/mrepo/ChangeLog
   trunk/tools/mrepo/mrepo
Log:
Added hardlinkpy support

Modified: trunk/tools/mrepo/ChangeLog
===================================================================
--- trunk/tools/mrepo/ChangeLog	2007-12-08 00:36:08 UTC (rev 6038)
+++ trunk/tools/mrepo/ChangeLog	2007-12-10 12:28:02 UTC (rev 6039)
@@ -22,6 +22,7 @@
 - Added youget tool to download packages from Yast Online Update
 - Added new OES1 and OES2 dist configs (Nicole Hähnel)
 - Fix elementtree for python 2.5 and higher (Leo Eraly)
+- Added hardlinkpy support
 
 * 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-12-08 00:36:08 UTC (rev 6038)
+++ trunk/tools/mrepo/mrepo	2007-12-10 12:28:02 UTC (rev 6039)
@@ -190,7 +190,8 @@
         self.cmd['createrepo'] = self.getoption('main', 'createrepocmd', '/usr/bin/createrepo')
         self.cmd['genbasedir'] = self.getoption('main', 'genbasedircmd', '/usr/bin/genbasedir')
         self.cmd['hardlink'] = self.getoption('main', 'hardlinkcmd', '/usr/sbin/hardlink')
-        self.cmd['hardlink++'] = self.getoption('main', 'hardlinkpluscmd', '/usr/bin/hardlink++')
+        self.cmd['hardlink++'] = self.getoption('main', 'hardlinkcppcmd', '/usr/bin/hardlink++')
+        self.cmd['hardlinkpy'] = self.getoption('main', 'hardlinkpycmd', '/usr/bin/hardlinkpy')
         self.cmd['lftp'] = self.getoption('main', 'lftpcmd', '/usr/bin/lftp')
         self.cmd['mirrordir'] = self.getoption('main', 'mirrordircmd', '/usr/bin/mirrordir')
         self.cmd['mount'] = self.getoption('main', 'mountcmd', '/bin/mount')
@@ -1361,8 +1362,14 @@
 def hardlink(srcdir):
     info(1, 'Hardlinking duplicate packages in %s.' % srcdir)
     opts = ''
-    if cf.cmd['hardlink++']:
+    if cf.cmd['hardlinkpy']:
         if op.verbose <= 2:
+            opts = ' -v 0'
+        else:
+            opts = ' -v %d' % (op.verbose - 2)
+        run('%s %s %s' % (cf.cmd['hardlinkpy'], os.path.join(srcdir, ''), opts))
+    elif cf.cmd['hardlink++']:
+        if op.verbose <= 2:
             opts = '>/dev/null'
         run('%s %s %s' % (cf.cmd['hardlink++'], os.path.join(srcdir, ''), opts))
     elif cf.cmd['hardlink']: