summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-09-28 20:16:48 +0000
committerZac Medico <zmedico@gentoo.org>2007-09-28 20:16:48 +0000
commitaa9c02fc58e4feca71eeea7fb8ed946f01d3acd1 (patch)
treea9543576f342f67d78405242f82dbbc63f9c7f99 /bin
parentcc95945573a63d3ab9d1281316d91d7ec3327733 (diff)
downloadportage-aa9c02fc58e4feca71eeea7fb8ed946f01d3acd1.tar.gz
portage-aa9c02fc58e4feca71eeea7fb8ed946f01d3acd1.tar.bz2
portage-aa9c02fc58e4feca71eeea7fb8ed946f01d3acd1.zip
When scanning for config updates, treat a symlink to an existing
directory as if it's just a normal directory. (trunk r7873) svn path=/main/branches/2.1.2/; revision=7874
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge9
1 files changed, 9 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index 94aa6b0a1..7dc67c8c5 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4523,6 +4523,15 @@ def chk_updated_cfg_files(target_root, config_protect):
mymode = os.lstat(x).st_mode
except OSError:
continue
+ if stat.S_ISLNK(mymode):
+ # We want to treat it like a directory if it
+ # is a symlink to an existing directory.
+ try:
+ real_mode = os.stat(x).st_mode
+ if stat.S_ISDIR(real_mode):
+ mymode = real_mode
+ except OSError:
+ pass
if stat.S_ISDIR(mymode):
mycommand = "find '%s' -iname '._cfg????_*'" % x
else: