[gentoo-commits] portage r15370 - main/trunk/bin

[gentoo-commits] portage r15370 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2010-02-18 16:26:32 +0000 (Thu, 18 Feb 2010)
New Revision: 15370

Modified:
   main/trunk/bin/dispatch-conf
Log:
Remove diffutils version detection code since it's not really needed.


Modified: main/trunk/bin/dispatch-conf
===================================================================
--- main/trunk/bin/dispatch-conf	2010-02-18 09:01:48 UTC (rev 15369)
+++ main/trunk/bin/dispatch-conf	2010-02-18 16:26:32 UTC (rev 15370)
@@ -42,7 +42,6 @@
 DIFF_CONTENTS        = "diff -Nu '%s' '%s'"
 DIFF_CVS_INTERP      = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '# .Header:.*'"
 DIFF_WSCOMMENTS      = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][:space:]*$'"
-diffutils_2_9 = False
 
 # We need a secure scratch dir and python does silly verbose errors on the use of tempnam
 oldmask = os.umask(0o077)
@@ -119,15 +118,6 @@
                     return False
 
         merge_cmd = self.options.get("merge", "").split()
-        global diffutils_2_9
-        if merge_cmd and merge_cmd[0] == 'sdiff':
-            vardb = portage.db['/']['vartree'].dbapi
-            diffutils = vardb.match('sys-apps/diffutils')
-            if diffutils:
-                diffutils = diffutils[0]
-                diffutils_ver = '-'.join(portage.catpkgsplit(diffutils)[2:])
-                if portage.vercmp(diffutils_ver, '2.9') >= 0:
-                    diffutils_2_9 = True
 
         # config file freezing support
         frozen_files = set(self.options.get("frozen-files", "").split())
@@ -279,9 +269,8 @@
                     print()
                     ret = os.system (self.options['merge'] % (merged, conf ['current'], newconf))
                     ret = os.WEXITSTATUS(ret)
-                    if diffutils_2_9:
-                        if ret < 2:
-                            ret = 0
+                    if ret < 2:
+                        ret = 0
                     if ret:
                         print("Failure running 'merge' command")
                         continue