| 1 |
On Saturday 12 August 2006 17:28, reader@×××××××.com wrote: |
| 2 |
> The following occurs when running an update world following a sync today. |
| 3 |
> |
| 4 |
> --- Invalid atom in /usr/portage/profiles/package.mask: >>>>>>> 1.5723 |
| 5 |
> --- Invalid atom in /usr/portage/profiles/package.mask: ======= |
| 6 |
> --- Invalid atom in /usr/portage/profiles/package.mask: <<<<<<< |
| 7 |
[...] |
| 8 |
> There are 1500+ lines and I didn't know what to look for: |
| 9 |
|
| 10 |
You could look for lines including ">>>>", "====" or "<<<<". Those are actual |
| 11 |
lines in package.mask that are invalid and caused by a cvs conflict... But as |
| 12 |
previously posted just sync again. |
| 13 |
|
| 14 |
-- |
| 15 |
Bo Andresen |
Archives