summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-15 06:39:38 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-15 06:39:38 +0000
commitc5dac4525565e3e9cee461516114b004c4a32295 (patch)
tree69eaf3074c11c5e2428be910685ce9314d463547
parent73c2e1f03adaf214371e1226acd0d069c029437a (diff)
downloadportage-c5dac4525565e3e9cee461516114b004c4a32295.tar.gz
portage-c5dac4525565e3e9cee461516114b004c4a32295.tar.bz2
portage-c5dac4525565e3e9cee461516114b004c4a32295.zip
Bug #173284 - Update config update counting code in chk_updated_cfg_files()
so hidden directories are ignored. (trunk r11933) svn path=/main/branches/2.1.6/; revision=11934
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6518b7583..8cd7d83e1 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -11125,11 +11125,11 @@ def chk_updated_cfg_files(target_root, config_protect):
except OSError:
pass
if stat.S_ISDIR(mymode):
- mycommand = "find '%s' -iname '._cfg????_*'" % x
+ mycommand = "find '%s' -name '.*' -type d -prune -o -name '._cfg????_*'" % x
else:
- mycommand = "find '%s' -maxdepth 1 -iname '._cfg????_%s'" % \
+ mycommand = "find '%s' -maxdepth 1 -name '._cfg????_%s'" % \
os.path.split(x.rstrip(os.path.sep))
- mycommand += " ! -iname '.*~' ! -iname '.*.bak' -print0"
+ mycommand += " ! -name '.*~' ! -iname '.*.bak' -print0"
a = commands.getstatusoutput(mycommand)
if a[0] != 0:
sys.stderr.write(" %s error scanning '%s': " % (bad("*"), x))