summaryrefslogtreecommitdiffstats
path: root/bin/dispatch-conf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-07 21:12:21 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-07 21:12:21 +0000
commitdf8d6ba2c17391be9afb0433a15df4b4d076ae20 (patch)
tree0c26b107e4f5f9f61de2e4b05b76d2b98b371454 /bin/dispatch-conf
parent8ca7557fca3d1316e2182d2eab67b85285b55a8f (diff)
downloadportage-df8d6ba2c17391be9afb0433a15df4b4d076ae20.tar.gz
portage-df8d6ba2c17391be9afb0433a15df4b4d076ae20.tar.bz2
portage-df8d6ba2c17391be9afb0433a15df4b4d076ae20.zip
For bug #165780, make config-protect code consistently ignore '.*~' and '.*.bak'. (trunk r5914)
svn path=/main/branches/2.1.2/; revision=5915
Diffstat (limited to 'bin/dispatch-conf')
-rwxr-xr-xbin/dispatch-conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 3033f1649..c8e4d5678 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -27,7 +27,7 @@ except ImportError:
import dispatch_conf
from portage_exec import find_binary
-FIND_EXTANT_CONFIGS = "find '%s' %s -iname '._cfg????_%s'"
+FIND_EXTANT_CONFIGS = "find '%s' %s -iname '._cfg????_%s' ! -iname '.*~' ! -iname '.*.bak'"
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:]*$"'