From: Zac Medico Date: Sat, 15 Nov 2008 06:39:38 +0000 (-0000) Subject: Bug #173284 - Update config update counting code in chk_updated_cfg_files() X-Git-Tag: v2.1.6_rc1~62 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5dac4525565e3e9cee461516114b004c4a32295;p=portage.git 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 --- 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))