104562 – package.mask editing error, mirrorselect wrongly masked

Bug 104562 - package.mask editing error, mirrorselect wrongly masked

Summary: package.mask editing error, mirrorselect wrongly masked

Status:	RESOLVED FIXED

Alias:	None

Product:	Gentoo Linux
Classification:	Unclassified
Component:	[OLD] Unspecified (show other bugs)
Hardware:	All All

Importance:	High normal
Assignee:	Gentoo Linux bug wranglers

URL:	http://www.gentoo.org/cgi-bin/viewcvs...
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2005-09-02 01:52 UTC by Joe Wells
Modified:	2005-09-02 04:12 UTC (History)
CC List:	0 users

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

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Joe Wells 2005-09-02 01:52:47 UTC

In the commit by xmerlin to profiles/package.mask that made version
1.4369, a CVS conflict was committed.  (Look at the diff between
1.4368 and 1.4369 to see this.)  In the next commit that made version
1.4370, xmerlin "fixed" the problem by simply removing the conflict
markers.

The result is that the latest version of mirrorselect is now wrongly
masked, forcing a downgrade.  The bad lines should be removed to fix
this problem.


Reproducible: Always
Steps to Reproduce:

Comment 1 Jakub Moc (RETIRED) gentoo-dev

2005-09-02 02:06:16 UTC

<snip>
 06 Jun 2005; <tercel@gentoo.org> ChangeLog:
  added new version. this is a complete rewrite, so it is under package.mask
  for testing
</snip>

Comment 2 Joe Wells 2005-09-02 02:42:20 UTC

Did you look at the URL I gave in the bug report?  This is obviously a CVS
conflict error.

For further evidence, tercel himself *unmasked* the package on 2005-07-11 with
the comment "Remove mirrorselect testing mask":

http://www.gentoo.org/cgi-bin/viewcvs.cgi/profiles/package.mask?r1=1.4183&r2=1.4184

Comment 3 Christian Zoffoli (RETIRED) gentoo-dev

2005-09-02 04:12:34 UTC

fixed in cvs, thanks