Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 143676 - Spurious lines in /etc/portage/package.mask
Summary: Spurious lines in /etc/portage/package.mask
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Eclasses (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo Linux bug wranglers
URL:
Whiteboard:
Keywords:
: 143685 (view as bug list)
Depends on:
Blocks:
 
Reported: 2006-08-12 07:21 UTC by Jose daLuz
Modified: 2006-08-12 08:43 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jose daLuz 2006-08-12 07:21:01 UTC
I just sync'ed, and now emerging anything produces the following errors:
--- Invalid atom in /usr/portage/profiles/package.mask: >>>>>>> 1.5723
--- Invalid atom in /usr/portage/profiles/package.mask: =======
--- Invalid atom in /usr/portage/profiles/package.mask: <<<<<<< package.mask
--- Invalid atom in /usr/portage/profiles/package.mask: >>>>>>> 1.5723
--- Invalid atom in /usr/portage/profiles/package.mask: =======
--- Invalid atom in /usr/portage/profiles/package.mask: <<<<<<< package.mask

Looking in the file, it does indeed have such lines:

<<<<<<< package.mask
# Fernando J. Pereda <ferdy@gentoo.org> (18 May 2006)
# This ebuild is for patch testing purposes. Things might break.
>=mail-client/mutt-1.5.11-r30

# Chris Gianelloni <wolf31o2@gentoo.org> (11 May 2006)
# These are masked, since they only work with the 0.0.8 version of openal with
# the split out freealut.  They will *not* work with the "best version" stable
# or ~arch openal in the tree.  These are perfectly safe to use if you have
# openal-0.0.8 and freealut installed.
=games-action/chromium-0.9.12-r6
=games-arcade/excido-0.1.5c-r1
=games-fps/blackshades-cvs-20031110-r1
=games-rps/eternal-lands-1.2.0_p1-r2
=games-sports/torcs-1.2.4-r1
=games-sports/trigger-0.5.2-r1
=games-sports/ultimatestunts-0.6.1-r1
=games-strategy/boson-0.11-r1
=games-strategy/scorched3d-39.1-r1

=======
>>>>>>> 1.5723
# Roy Marples <uberlord@gentoo.org> (09 May 2006)
# Masked for testing, although it works very well for me.
>=net-misc/openvpn-2.1_beta
Comment 1 David Li 2006-08-12 07:22:00 UTC
I confirm this:
sent 10888 bytes  received 4113961 bytes  17895.22 bytes/sec
total size is 148292794  speedup is 35.95
--- Invalid atom in /usr/portage/profiles/package.mask: >>>>>>> 1.5723
--- Invalid atom in /usr/portage/profiles/package.mask: =======
--- Invalid atom in /usr/portage/profiles/package.mask: <<<<<<< package.mask
Comment 2 David Li 2006-08-12 07:30:00 UTC
This is from Revision 1.5724 which was commited roughly an hour ago.
Looks like it's hitting the mirrors now.
Comment 3 Jakub Moc (RETIRED) gentoo-dev 2006-08-12 07:31:59 UTC
Please, emerge --sync again (leave at least one hour from your last sync). Can't see any such thing in CVS. Looks like you synced when there was a collision in CVS.
Comment 4 Jakub Moc (RETIRED) gentoo-dev 2006-08-12 07:32:50 UTC
For the record, you need:

# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.5725 2006/08/12 14:15:44 seemant Exp $

or later.
Comment 5 Jose daLuz 2006-08-12 08:25:30 UTC
I just sync'ed and got the fixed version. 

I just saw the first forum post on this error from someone else, so the collision was there long enough to affect others as well.

Reopening so you can close it FIXED.
Comment 6 Jakub Moc (RETIRED) gentoo-dev 2006-08-12 08:43:01 UTC
*** Bug 143685 has been marked as a duplicate of this bug. ***
Comment 7 Jakub Moc (RETIRED) gentoo-dev 2006-08-12 08:43:17 UTC
Thanks, closing.