From 52f08e9f46ed7c31a1cc03b2e84441ea2f2bf356 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Apr 2006 21:11:31 +0000 Subject: Revert r3129 and r3130 because they don't solve bug #129515. svn path=/main/trunk/; revision=3132 --- bin/dispatch-conf | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'bin/dispatch-conf') diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 4df6306f7..586b98759 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -18,16 +18,8 @@ import os, shutil, sys, string, re, commands, atexit sys.path = ["/usr/lib/portage/pym"]+sys.path import portage, dispatch_conf -import portage_exec - -# `readlink -f` is not supported on all systems, so it's necessary to test for -# the alternative "realpath" program. -FIND_EXTANT_CONFIGS = "find -L %s/ -iname '._cfg????_*' -exec realpath '{}' ';' | uniq | sed -e 's://:/:g'" -realpath_binary = portage_exec.find_binary("realpath") -if realpath_binary is None: - FIND_EXTANT_CONFIGS = FIND_EXTANT_CONFIGS.replace("realpath", "readlink -q -f") -del realpath_binary +FIND_EXTANT_CONFIGS = "find %s/ -iname '._cfg????_*' | sed -e 's://:/:g'" 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:]*$"' -- cgit v1.2.3-1-g7c22