hierarchy in setup (category stuff)

[Christopher Faylor]

On Sat, Jun 30, 2001 at 12:43:20PM +1000, Robert Collins wrote:
>I think this gets them all. I thought I'd not trashed Michael's whate space
>changes - although where code moved between functions, they would have been
>lost regardless.
>
>I'm happy if rolling back is easier for you, but I suspect that its the same
>effort either way.

This wasn't all of them either.  Some of my changes affected your new code so
there was some hand-applying necessary.

I have checked in something that seems to work.

I'm still not completely satisfied with the Skip/Keep stuff, though.
Your code was assuming that you could just set Skip and that was ok but
my changes made Skip an invalid state if the package was installed.  So,
"Keep" is appropriate in those cases.

I think that I got that working again but I don't like the way that I did it.

I think I have to sleep on this.

cgf