diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-01-27 22:58:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-27 22:58:49 +0000 |
| commit | 4c783e524aeab68f5a1f19d9559021831c40e3f4 (patch) | |
| tree | c5f14e33e7fae806b5ac0395d67be417d5ae299a /bin/emerge | |
| parent | add support for parsing of unicode quotes (diff) | |
| download | portage-4c783e524aeab68f5a1f19d9559021831c40e3f4.tar.gz portage-4c783e524aeab68f5a1f19d9559021831c40e3f4.tar.bz2 portage-4c783e524aeab68f5a1f19d9559021831c40e3f4.zip | |
Ignore EEXIST from rmdir since some kernels (such as solaris) return that instead of ENOTEMPTY.
svn path=/main/trunk/; revision=5798
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index e4100b73b..119705691 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2993,7 +2993,8 @@ class MergeTask(object): try: os.rmdir(catdir) except OSError, e: - if e.errno != errno.ENOTEMPTY: + if e.errno not in (errno.ENOENT, + errno.ENOTEMPTY, errno.EEXIST): raise del e portage.locks.unlockdir(catdir_lock) |