summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-14 03:32:30 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-14 03:32:30 +0000
commit25d23593b4fa78f7e9694498ef71bca13acdb061 (patch)
treefea61507d6f33146061d923308532a8bc9f06416
parent3d0133b5422d23a203b8bb9e93f05e85c84c886b (diff)
downloadportage-25d23593b4fa78f7e9694498ef71bca13acdb061.tar.gz
portage-25d23593b4fa78f7e9694498ef71bca13acdb061.tar.bz2
portage-25d23593b4fa78f7e9694498ef71bca13acdb061.zip
Bug #240656 - Unmerge broken symlinks where a directory was expected.
(merged from branches/prefix r14248) svn path=/main/trunk/; revision=14250
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index da7426880..284d5ff1f 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2481,7 +2481,7 @@ class dblink(object):
continue
if pkgfiles[objkey][0] == "dir":
- if statobj is None or not stat.S_ISDIR(statobj.st_mode):
+ if lstatobj is None or not stat.S_ISDIR(lstatobj.st_mode):
show_unmerge("---", unmerge_desc["!dir"], file_type, obj)
continue
mydirs.append(obj)