|
Lines 2464-2484
Link Here
|
| 2464 |
|
2464 |
|
| 2465 |
# Don't unlink symlinks to directories here since that can |
2465 |
# Don't unlink symlinks to directories here since that can |
| 2466 |
# remove /lib and /usr/lib symlinks. |
2466 |
# remove /lib and /usr/lib symlinks. |
| 2467 |
if unmerge_orphans and \ |
|
|
| 2468 |
lstatobj and not stat.S_ISDIR(lstatobj.st_mode) and \ |
| 2469 |
not (islink and statobj and stat.S_ISDIR(statobj.st_mode)) and \ |
| 2470 |
not self.isprotected(obj): |
| 2471 |
try: |
| 2472 |
unlink(obj, lstatobj) |
| 2473 |
except EnvironmentError as e: |
| 2474 |
if e.errno not in ignored_unlink_errnos: |
| 2475 |
raise |
| 2476 |
del e |
| 2477 |
show_unmerge("<<<", "", file_type, obj) |
| 2478 |
continue |
| 2479 |
|
2467 |
|
| 2480 |
lmtime = str(lstatobj[stat.ST_MTIME]) |
2468 |
lmtime = str(lstatobj[stat.ST_MTIME]) |
| 2481 |
if (pkgfiles[objkey][0] not in ("dir", "fif", "dev")) and (lmtime != pkgfiles[objkey][1]): |
2469 |
# Don't check mtime if FEATURES=unmerge-orphans |
|
|
2470 |
if not unmerge_orphans and (pkgfiles[objkey][0] not in ("dir", "fif", "dev")) and (lmtime != pkgfiles[objkey][1]): |
| 2482 |
show_unmerge("---", unmerge_desc["!mtime"], file_type, obj) |
2471 |
show_unmerge("---", unmerge_desc["!mtime"], file_type, obj) |
| 2483 |
continue |
2472 |
continue |
| 2484 |
|
2473 |
|
|
Lines 2520-2526
Link Here
|
| 2520 |
|
2509 |
|
| 2521 |
# string.lower is needed because db entries used to be in upper-case. The |
2510 |
# string.lower is needed because db entries used to be in upper-case. The |
| 2522 |
# string.lower allows for backwards compatibility. |
2511 |
# string.lower allows for backwards compatibility. |
| 2523 |
if mymd5 != pkgfiles[objkey][2].lower(): |
2512 |
# Don't check md5 if FEATURES=unmerge-orphans |
|
|
2513 |
if not unmerge_orphans and (mymd5 != pkgfiles[objkey][2].lower()): |
| 2524 |
show_unmerge("---", unmerge_desc["!md5"], file_type, obj) |
2514 |
show_unmerge("---", unmerge_desc["!md5"], file_type, obj) |
| 2525 |
continue |
2515 |
continue |
| 2526 |
try: |
2516 |
try: |
