For bug #165780, make config-protect code consistently ignore '.*~' and '.*.bak'...

svn path=/main/branches/2.1.2/; revision=5915

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 3033f164941af7261ddc59f40e6aee65d115a5cc..c8e4d567857caf223eb5f3ce554b1ee3f27e8ada 100755 (executable)
--- 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:]*$"'

diff --git a/bin/emerge b/bin/emerge
index 0256460bb11a51a5491a225779dabdb89714e4f6..a4888188a32133857b351dcdc7dfe6e84285cf0a 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3573,7 +3573,8 @@ def chk_updated_cfg_files(target_root, config_protect):
                        else:
                                mycommand = "cd '%s'; find . -maxdepth 1 -iname '._cfg????_%s'" % \
                                        os.path.split(x.rstrip(os.path.sep))
-                       a = commands.getstatusoutput(mycommand)
+                       a = commands.getstatusoutput(mycommand + \
+                               " ! -iname '.*~' ! -iname '.*.bak'")
                        if a[0] != 0:
                                print >> sys.stderr, " " + bad("*")+ " error scanning '%s'" % x
                        else: