diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-01-29 01:46:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-29 01:46:37 +0000 |
| commit | 0dc60ce69567f79f5d05148d80109cd7a6e93785 (patch) | |
| tree | c0e0198682fd37feb7e06c8eb47090d3f9a12459 /bin | |
| parent | d93e81cd32654d55c36499db6cacad5fecebd96d (diff) | |
| download | portage-0dc60ce69567f79f5d05148d80109cd7a6e93785.tar.gz portage-0dc60ce69567f79f5d05148d80109cd7a6e93785.tar.bz2 portage-0dc60ce69567f79f5d05148d80109cd7a6e93785.zip | |
Ignore EEXIST from rmdir since some kernels (such as solaris) return that instead of ENOTEMPTY. (trunk r5798)v2.1.2-r5
svn path=/main/branches/2.1.2/; revision=5830
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 1302818a7..a3561aee7 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2992,7 +2992,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) |