From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 14 Sep 2009 03:32:30 +0000 (-0000)
Subject: Bug #240656 - Unmerge broken symlinks where a directory was expected.
X-Git-Tag: v2.2_rc41~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25d23593b4fa78f7e9694498ef71bca13acdb061;p=portage.git

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 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)