| 1 |
commit: 38ab9edcb86df7c2ab057013e40c7389c6c51b70 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 29 20:16:34 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 29 20:16:34 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=38ab9edc |
| 7 |
|
| 8 |
unmerge: fix false alarm about protected symlinks |
| 9 |
|
| 10 |
The error message about preserved symlinks, from commit |
| 11 |
4bb08136f073024c5d31dceb1618b6f4e7246369, should only be triggered in |
| 12 |
cases when the package being unmerged has the given path listed as a |
| 13 |
symlink in its CONTENTS. |
| 14 |
|
| 15 |
--- |
| 16 |
pym/portage/dbapi/vartree.py | 2 +- |
| 17 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 20 |
index e85e0b8..6317af7 100644 |
| 21 |
--- a/pym/portage/dbapi/vartree.py |
| 22 |
+++ b/pym/portage/dbapi/vartree.py |
| 23 |
@@ -2030,7 +2030,7 @@ class dblink(object): |
| 24 |
is_owned = True |
| 25 |
break |
| 26 |
|
| 27 |
- if is_owned and \ |
| 28 |
+ if file_type == "sym" and is_owned and \ |
| 29 |
(islink and statobj and stat.S_ISDIR(statobj.st_mode)): |
| 30 |
# A new instance of this package claims the file, so |
| 31 |
# don't unmerge it. If the file is symlink to a |
Archives