diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-28 08:28:20 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-28 08:28:20 +0000 |
| commit | 6562f79a3620553ed3310084ae9860bfc484ef98 (patch) | |
| tree | cb9fe5b3e8654fdfaed0815d8084b46d2293c078 /bin/emerge | |
| parent | bbafb0cfaee0b223be83c352c1ced58b04f76a9e (diff) | |
| download | portage-6562f79a3620553ed3310084ae9860bfc484ef98.tar.gz portage-6562f79a3620553ed3310084ae9860bfc484ef98.tar.bz2 portage-6562f79a3620553ed3310084ae9860bfc484ef98.zip | |
In chk_updated_cfg_files(), avoid scanning for config files for
paths that aren't writable by the current user. This prevents
Permission denied errors from being triggered later when trying
to scan subdirectories that are inaccessible. (trunk r8726)
svn path=/main/branches/2.1.2/; revision=8727
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 89dd81752..6c3bf2b18 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4572,6 +4572,10 @@ def chk_updated_cfg_files(target_root, config_protect): procount=0 for x in config_protect: x = os.path.join(target_root, x.lstrip(os.path.sep)) + if not os.access(x, os.W_OK): + # Avoid Permission denied errors generated + # later by `find`. + continue try: mymode = os.lstat(x).st_mode except OSError: |