Bug #240656 - Unmerge broken symlinks where a directory was expected.

(merged from branches/prefix r14248)

svn path=/main/trunk/; revision=14250

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index da7426880e728e9d2841f51b1ef306ec6fe6dab0..284d5ff1f55c1567396dadc1b46b56cebe3c08ac 100644 (file)
--- 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)