diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-04-11 21:11:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-04-11 21:11:31 +0000 |
| commit | 52f08e9f46ed7c31a1cc03b2e84441ea2f2bf356 (patch) | |
| tree | 128183533033669f18fe075d458d55d197dabb15 /bin/dispatch-conf | |
| parent | 7908fd64c4fcc42155205792d501e113b5def560 (diff) | |
| download | portage-52f08e9f46ed7c31a1cc03b2e84441ea2f2bf356.tar.gz portage-52f08e9f46ed7c31a1cc03b2e84441ea2f2bf356.tar.bz2 portage-52f08e9f46ed7c31a1cc03b2e84441ea2f2bf356.zip | |
Revert r3129 and r3130 because they don't solve bug #129515.
svn path=/main/trunk/; revision=3132
Diffstat (limited to 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 10 |
1 files changed, 1 insertions, 9 deletions
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:]*$"' |