|
Lines 7471-7477
Link Here
|
| 7471 |
|
7471 |
|
| 7472 |
#process symlinks second-to-last, directories last. |
7472 |
#process symlinks second-to-last, directories last. |
| 7473 |
mydirs = [] |
7473 |
mydirs = [] |
| 7474 |
ignored_unlink_errnos = (errno.ENOENT, errno.ENOTDIR, errno.EISDIR) |
7474 |
ignored_unlink_errnos = ( |
|
|
7475 |
errno.EBUSY, errno.ENOENT, |
| 7476 |
errno.ENOTDIR, errno.EISDIR) |
| 7477 |
ignored_rmdir_errnos = ( |
| 7478 |
errno.EEXIST, errno.ENOTEMPTY, |
| 7479 |
errno.EBUSY, errno.ENOENT, |
| 7480 |
errno.ENOTDIR, errno.EISDIR) |
| 7475 |
modprotect = os.path.join(self.vartree.root, "lib/modules/") |
7481 |
modprotect = os.path.join(self.vartree.root, "lib/modules/") |
| 7476 |
|
7482 |
|
| 7477 |
def unlink(file_name, lstatobj): |
7483 |
def unlink(file_name, lstatobj): |
|
Lines 7636-7644
Link Here
|
| 7636 |
bsd_chflags.chflags(parent_name, pflags) |
7642 |
bsd_chflags.chflags(parent_name, pflags) |
| 7637 |
show_unmerge("<<<", "", "dir", obj) |
7643 |
show_unmerge("<<<", "", "dir", obj) |
| 7638 |
except EnvironmentError, e: |
7644 |
except EnvironmentError, e: |
| 7639 |
if e.errno not in (errno.ENOENT, |
7645 |
if e.errno not in ignored_rmdir_errnos: |
| 7640 |
errno.EEXIST, errno.ENOTEMPTY, |
|
|
| 7641 |
errno.ENOTDIR): |
| 7642 |
raise |
7646 |
raise |
| 7643 |
if e.errno != errno.ENOENT: |
7647 |
if e.errno != errno.ENOENT: |
| 7644 |
show_unmerge("---", "!empty", "dir", obj) |
7648 |
show_unmerge("---", "!empty", "dir", obj) |
