diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-07 21:12:21 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-07 21:12:21 +0000 |
| commit | df8d6ba2c17391be9afb0433a15df4b4d076ae20 (patch) | |
| tree | 0c26b107e4f5f9f61de2e4b05b76d2b98b371454 /bin | |
| parent | 8ca7557fca3d1316e2182d2eab67b85285b55a8f (diff) | |
| download | portage-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')
| -rwxr-xr-x | bin/dispatch-conf | 2 | ||||
| -rwxr-xr-x | bin/emerge | 3 |
2 files changed, 3 insertions, 2 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:]*$"' diff --git a/bin/emerge b/bin/emerge index 0256460bb..a4888188a 100755 --- 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: |