Re: [gentoo-alt] unemerging causes a bad symlink removal

[Alan Hourihane]

On Sun, 2009-09-06 at 09:12 +0200, Fabian Groffen wrote:
> On 05-09-2009 21:45:27 +0100, Alan Hourihane wrote:
> > > looks like Portage already tries to avoid doing something wrong:
> > >
> > > 			if pkgfiles[objkey][0] == "dir":
> > > 				if statobj is None or not stat.S_ISDIR(statobj.st_mode):
> > > 					show_unmerge("---", unmerge_desc["!dir"], file_type, obj)
> > > 					continue
> > > 				mydirs.append(obj)
> > >
> > > it only removes directories that are in mydirs, and technically it
> > > should never find your /usr dir, so that seems to be the bug to me
> >
> > Yeah, I think it should be using lstatobj and not statobj because it'll
> > end up stating the symlinks pointer.
>
> right, I suspected something like that.

Confirmed...

Changing this line from....

if statobj is None or not stat.S_ISDIR(statobj.st_mode):

to

if lstatobj is None or not stat.S_ISDIR(lstatobj.st_mode):

Fixes the problem.

Alan.