summaryrefslogtreecommitdiffstats
path: root/bin/dispatch-conf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-07 21:11:44 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-07 21:11:44 +0000
commit7bab46cb15d81316441db05c078ca01a30230ceb (patch)
tree15d496a5b6690f2af37f38f8e7ef20afab2d0d84 /bin/dispatch-conf
parent8d140b782824dc17c600f0fe006f7929de2b85fc (diff)
downloadportage-7bab46cb15d81316441db05c078ca01a30230ceb.tar.gz
portage-7bab46cb15d81316441db05c078ca01a30230ceb.tar.bz2
portage-7bab46cb15d81316441db05c078ca01a30230ceb.zip
For bug #165780, make config-protect code consistently ignore '.*~' and '.*.bak'.
svn path=/main/trunk/; revision=5914
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 397dfd420..309bd0db1 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -27,7 +27,7 @@ except ImportError:
import dispatch_conf
from portage.process 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:]*$"'