public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Pacho Ramos <pacho@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Subject: Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes
Date: Thu, 02 Aug 2012 08:36:14 +0200	[thread overview]
Message-ID: <1343889374.2163.0.camel@belkin4> (raw)
In-Reply-To: <5019B83F.1020807@gentoo.org>

[-- Attachment #1: Type: text/plain, Size: 1150 bytes --]

El mié, 01-08-2012 a las 16:14 -0700, Zac Medico escribió:
> On 08/01/2012 03:19 AM, Pacho Ramos wrote:
> > On every openrc update I get dispatch-conf wanting to revert all my
> > changes in /etc/conf.d files, like KEYMAP, clock...
> > 
> > Is there any way to prevent it from doing that?
> > 
> > Thanks a lot for the info
> > 
> 
> Maybe we can trace the behavior back to the diff3 command that it's
> using. Inside /usr/lib/portage/pym/portage/dispatch_conf.py we have this
> command:
> 
>   DIFF3_MERGE = "diff3 -mE '%s' '%s' '%s' > '%s'"
> 
> Are you able to reproduce the problem by running this command manually?
> 
> Something like this:
> 
>    diff3 -mR /etc/conf.d/hostname \
> 	/etc/config-archive/etc/conf.d/hostname.dist  \
> 	/etc/conf.d/._cfg0000_hostname > /tmp/mrgconf

I will probably need to reemerge it as I already merged changes and
re-edited config files. Anyway, diff3 looks to not admit -R option:
$ diff3
-mR /etc/conf.d/hostname /etc/config-archive/etc/conf.d/hostname.dist /etc/conf.d/._cfg0000_hostname
diff3: opción inválida -- R
diff3: Pruebe `diff3 --help' para más información.


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

  reply	other threads:[~2012-08-02  9:05 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-01 10:19 [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes Pacho Ramos
2012-08-01 15:33 ` [gentoo-portage-dev] " Duncan
2012-08-01 23:16   ` Zac Medico
2012-08-01 23:14 ` [gentoo-portage-dev] " Zac Medico
2012-08-02  6:36   ` Pacho Ramos [this message]
2012-08-02 19:34     ` Zac Medico
2012-09-12 20:03       ` Pacho Ramos
2012-08-02 22:56 ` Zac Medico
2012-09-12 20:05   ` Pacho Ramos
2012-09-23 10:59     ` Pacho Ramos
2012-09-23 18:06       ` Zac Medico
2012-09-27 20:16         ` Pacho Ramos
2012-09-27 20:21           ` Zac Medico
2012-09-27 20:36             ` Pacho Ramos
2012-09-27 20:41               ` Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1343889374.2163.0.camel@belkin4 \
    --to=pacho@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox