| 1 |
On 05/22/2016 01:21 AM, Michał Górny wrote: |
| 2 |
> Introduce a new logic for INSTALL_MASK handling in merging code, |
| 3 |
> replacing the old code that removed matching files and directories |
| 4 |
> from imagedir in bash. The new code actually ignores matching files |
| 5 |
> on-the-fly while testing for file collisions and merging files. |
| 6 |
> The files are still written to CONTENTS, and output using "###" zing |
| 7 |
> to indicate being masked, yet are not actually merged to the filesystem. |
| 8 |
|
| 9 |
Since collision-protect relies on existing files in its collision test, |
| 10 |
install-masked files are no longer going to trigger collisions. Then, |
| 11 |
since the install-masked files are still written to CONTENTS, it's |
| 12 |
possible for the unmerge of one package to unmerge colliding files that |
| 13 |
belong to another package! |
| 14 |
|
| 15 |
There are a number of ways to solve this problem. For example, we could |
| 16 |
have the unmerge code ignore any files in CONTENTS that match the |
| 17 |
INSTALL_MASK value that was used at merge time. |
| 18 |
-- |
| 19 |
Thanks, |
| 20 |
Zac |
Archives