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