FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Gentoo > Gentoo Development

 
 
LinkBack Thread Tools
 
Old 12-04-2008, 02:56 AM
"Alec Warner"
 
Default gentoo-x86 commit in profiles: ChangeLog package.mask

On Wed, Dec 3, 2008 at 1:31 PM, Robin H. Johnson <robbat2@gentoo.org> wrote:
> I'd like to implore ALL developers to please ensure that they don't
> commit broken stuff into profiles, esp. corrupt atoms in package.mask.

Imploring is ineffective, humans fail.

>
> This change went into profiles/package.mask, and caused breakage for one
> sync window.
>> +=net-p2p/ktorrent-3.2_*
> A few days ago we had a different one:
>> +>=dev-util/monodevelop-java--1.9
> That managed to break the sync during rsync, but also by timing also
> managed to end up in the daily snapshot.
>
> If it's in profiles, or a core system package, please be very careful
> with your commits. Both of the above were fixed in less than 30 minutes,
> but breakage had already been seen at that point.

I've filed bug 249761 to track a reasonable fix for this.

-Alec

>
> --
> Robin Hugh Johnson
> Gentoo Linux Developer & Infra Guy
> E-Mail : robbat2@gentoo.org
> GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
>
 
Old 11-16-2010, 07:13 AM
Peter Volkov
 
Default gentoo-x86 commit in profiles: ChangeLog package.mask

eiВ Втр, 16/11/2010 в 07:53 +0100, Hans de Graaff пишет:
> On Tue, 2010-11-16 at 06:40 +0000, Peter Volkov (pva) wrote:
> >
> > +# Peter Volkov <pva@gentoo.org> (16 Nov 2010)
> > +# Last rites: dev-python/py-rrdtool #345701
> > +# Old python bindins that currently are included into net-analyzer/rrdtool
> > +# Removal on 16 Dec 2010
> > +dev-python/py-rrdtool
>
> I have a similar todo item on my list for the standalone ruby bindings,
> but I have not masked them yet because rrdtool 1.0.50 doesn't include
> them and is still in the tree. I'm not sure when the python bindings got
> incorporated into rrdtool, but I'm guessing it might be similar.

> Any plans to remove rrdtool-1.0.50 from the tree? Or should I just go
> ahead and remove the ruby bindings anyway?

rrdtool-1.0 is used by SFlowtool and last time I've tried it worked so I
don't see any reason to drop rrdtool-1.0.50 from the tree. As for
bindings, py-rrdtool have known problems and thus I've decided to drop
it. Probably it's good idea to do the same for ruby bindings as rrdtool
ChangeLog suggests that some problems were fixed there too.

If users need bindings they better use recent rrdtool and bundled
bindings, rrdtool-1.0.x for sflowtool only.

--
Peter.
 
Old 07-12-2012, 06:50 PM
Alexandre Rostovtsev
 
Default gentoo-x86 commit in profiles: ChangeLog package.mask

Shouldn't CVS have prevented my changes to profile.mask from being
overwritten by the next committer?

> chainsaw 12/07/11 12:24:43
>
> Modified: ChangeLog package.mask
> Log:
> Mask =net-misc/asterisk-10.6.0 for null pointer dereferencing.
>
> Revision Changes Path
> 1.6769 profiles/ChangeLog
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.6769&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.6769&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?r1=1.6768&r2=1.6769
>
> Index: ChangeLog
> ================================================== =================
> RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v
> retrieving revision 1.6768
> retrieving revision 1.6769
> diff -u -r1.6768 -r1.6769
> --- ChangeLog 10 Jul 2012 16:54:21 -0000 1.6768
> +++ ChangeLog 11 Jul 2012 12:24:42 -0000 1.6769
> @@ -1,11 +1,14 @@
> # ChangeLog for profile directory
> # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
> -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6768 2012/07/10 16:54:21 tetromino Exp $
> +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6769 2012/07/11 12:24:42 chainsaw Exp $
> #
> # This ChangeLog should include records for all changes in profiles directory.
> # Only typo fixes which don't affect portage/repoman behaviour could be avoided
> # here. If in doubt put a record here!
>
> + 11 Jul 2012; Tony Vroon <chainsaw@gentoo.org> package.mask:
> + Mask =net-misc/asterisk-10.6.0 for null pointer dereferencing.
> +
> 10 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
> Mask gnome-extra/gnome-screensaver-3.4.2 for bug #425070.
>
> 1.13950 profiles/package.mask
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.13950&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.13950&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?r1=1.13949&r2=1.13950
>
> Index: package.mask
> ================================================== =================
> RCS file: /var/cvsroot/gentoo-x86/profiles/package.mask,v
> retrieving revision 1.13949
> retrieving revision 1.13950
> diff -u -r1.13949 -r1.13950
> --- package.mask 10 Jul 2012 16:54:21 -0000 1.13949
> +++ package.mask 11 Jul 2012 12:24:42 -0000 1.13950
> @@ -1,5 +1,5 @@
> ################################################## ##################
> -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13949 2012/07/10 16:54:21
> tetromino Exp $
> +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13950 2012/07/11 12:24:42 chainsaw
> Exp $
> #
> # When you add an entry to the top of this file, add your name, the date, and
> # an explanation of why something is getting masked. Please be extremely
> @@ -31,9 +31,11 @@
>
> #--- END OF EXAMPLES ---
>
> -# Alexandre Rostovtsev <tetromino@gentoo.org> (10 Jul 2012)
> -# Fails to unlock the screen for some gnome-shell users, bug #425070
> -=gnome-extra/gnome-screensaver-3.4.2
> +# Tony Vroon <chainsaw@gentoo.org> (11 Jul 2012)
> +# This segfaults repeatedly in actual use for me, and I can not in good
> +# conscience allow this to surprise others. Unmask only to help trace
> +# where the fault is, not to run on live systems.
> +=net-misc/asterisk-10.6.0
>
> # Mike Gilbert <floppym@gentoo.org> (09 Jul 2012)
> # Dev channel releases are only for people who are developers or want more
>
 
Old 07-12-2012, 07:04 PM
Fabian Groffen
 
Default gentoo-x86 commit in profiles: ChangeLog package.mask

On 12-07-2012 14:50:18 -0400, Alexandre Rostovtsev wrote:
> Shouldn't CVS have prevented my changes to profile.mask from being
> overwritten by the next committer?

How could CVS have done that (or git, hg, whatever VCS)?


--
Fabian Groffen
Gentoo on a different level
 
Old 07-12-2012, 07:09 PM
Dirkjan Ochtman
 
Default gentoo-x86 commit in profiles: ChangeLog package.mask

On Thu, Jul 12, 2012 at 8:50 PM, Alexandre Rostovtsev
<tetromino@gentoo.org> wrote:
> Shouldn't CVS have prevented my changes to profile.mask from being
> overwritten by the next committer?

Maybe Tony mismerged your changes into his?

On Thu, Jul 12, 2012 at 9:04 PM, Fabian Groffen <grobian@gentoo.org> wrote:
> On 12-07-2012 14:50:18 -0400, Alexandre Rostovtsev wrote:
>> Shouldn't CVS have prevented my changes to profile.mask from being
>> overwritten by the next committer?
>
> How could CVS have done that (or git, hg, whatever VCS)?

In general, the VCS would not let you commit/push conflicting changes.
For CVS, I think you cannot commit unless your local copy is up to
date, so you'd have to update before committing, at which point CVS
would launch a merge tool or put merge markers in the file.

Right?

Dirkjan
 
Old 07-12-2012, 07:12 PM
"Tony "Chainsaw" Vroon"
 
Default gentoo-x86 commit in profiles: ChangeLog package.mask

On Thu, 2012-07-12 at 21:09 +0200, Dirkjan Ochtman wrote:
> Maybe Tony mismerged your changes into his?

Thank you for your trust in me.
cvs commit -m completed non-interactively, without notification of
conflict or request to merge.

Regards,
Tony V.
 
Old 07-12-2012, 07:16 PM
Dirkjan Ochtman
 
Default gentoo-x86 commit in profiles: ChangeLog package.mask

On Thu, Jul 12, 2012 at 9:12 PM, Tony "Chainsaw" Vroon
<chainsaw@gentoo.org> wrote:
> On Thu, 2012-07-12 at 21:09 +0200, Dirkjan Ochtman wrote:
>> Maybe Tony mismerged your changes into his?
>
> Thank you for your trust in me.
> cvs commit -m completed non-interactively, without notification of
> conflict or request to merge.

I certainly didn't mean to accuse you; I hoped to convey that this
happened accidentally, which in my experience happens once in a while
(though a problem with the tools might be more likely).

Cheers,

Dirkjan
 

Thread Tools




All times are GMT. The time now is 09:06 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org