| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-18 16:26:32 +0000 (Thu, 18 Feb 2010) |
| 3 |
New Revision: 15370 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/dispatch-conf |
| 7 |
Log: |
| 8 |
Remove diffutils version detection code since it's not really needed. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/bin/dispatch-conf |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/bin/dispatch-conf 2010-02-18 09:01:48 UTC (rev 15369) |
| 14 |
+++ main/trunk/bin/dispatch-conf 2010-02-18 16:26:32 UTC (rev 15370) |
| 15 |
@@ -42,7 +42,6 @@ |
| 16 |
DIFF_CONTENTS = "diff -Nu '%s' '%s'" |
| 17 |
DIFF_CVS_INTERP = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '# .Header:.*'" |
| 18 |
DIFF_WSCOMMENTS = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][:space:]*$'" |
| 19 |
-diffutils_2_9 = False |
| 20 |
|
| 21 |
# We need a secure scratch dir and python does silly verbose errors on the use of tempnam |
| 22 |
oldmask = os.umask(0o077) |
| 23 |
@@ -119,15 +118,6 @@ |
| 24 |
return False |
| 25 |
|
| 26 |
merge_cmd = self.options.get("merge", "").split() |
| 27 |
- global diffutils_2_9 |
| 28 |
- if merge_cmd and merge_cmd[0] == 'sdiff': |
| 29 |
- vardb = portage.db['/']['vartree'].dbapi |
| 30 |
- diffutils = vardb.match('sys-apps/diffutils') |
| 31 |
- if diffutils: |
| 32 |
- diffutils = diffutils[0] |
| 33 |
- diffutils_ver = '-'.join(portage.catpkgsplit(diffutils)[2:]) |
| 34 |
- if portage.vercmp(diffutils_ver, '2.9') >= 0: |
| 35 |
- diffutils_2_9 = True |
| 36 |
|
| 37 |
# config file freezing support |
| 38 |
frozen_files = set(self.options.get("frozen-files", "").split()) |
| 39 |
@@ -279,9 +269,8 @@ |
| 40 |
print() |
| 41 |
ret = os.system (self.options['merge'] % (merged, conf ['current'], newconf)) |
| 42 |
ret = os.WEXITSTATUS(ret) |
| 43 |
- if diffutils_2_9: |
| 44 |
- if ret < 2: |
| 45 |
- ret = 0 |
| 46 |
+ if ret < 2: |
| 47 |
+ ret = 0 |
| 48 |
if ret: |
| 49 |
print("Failure running 'merge' command") |
| 50 |
continue |
Archives