On Sun, 22 May 2016 08:56:03 +0200 Michał Górny <mgo...@gentoo.org> wrote:
> Introduce a new logic for INSTALL_MASK handling in merging code, > replacing the old code that removed matching files and directories > from imagedir in bash. The new code actually ignores matching files > on-the-fly while testing for file collisions and merging files. > The files are still written to CONTENTS, and output using "###" zing > to indicate being masked, yet are not actually merged to the filesystem. > --- > bin/misc-functions.sh | 17 ------ > pym/portage/dbapi/vartree.py | 102 > ++++++++++++++++++++++------------- > pym/portage/package/ebuild/config.py | 2 +- > 3 files changed, 65 insertions(+), 56 deletions(-) This actually fails when INSTALL_MASK is not defined. I will be sending another patch shortly. -- Best regards, Michał Górny <http://dev.gentoo.org/~mgorny/>
pgpD5HZwPJTkM.pgp
Description: OpenPGP digital signature