From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B526813800E for ; Thu, 2 Aug 2012 00:08:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C2DA21C004 for ; Thu, 2 Aug 2012 00:08:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 73847E05EF for ; Wed, 1 Aug 2012 23:14:09 +0000 (UTC) Received: from [192.168.26.5] (ip98-164-193-252.oc.oc.cox.net [98.164.193.252]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id EA2CA1B400B for ; Wed, 1 Aug 2012 23:14:08 +0000 (UTC) Message-ID: <5019B83F.1020807@gentoo.org> Date: Wed, 01 Aug 2012 16:14:07 -0700 From: Zac Medico User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:14.0) Gecko/20120719 Thunderbird/14.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 To: gentoo-portage-dev@lists.gentoo.org Subject: Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes References: <1343816360.25223.7.camel@belkin4> In-Reply-To: <1343816360.25223.7.camel@belkin4> X-Enigmail-Version: 1.5a1pre Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Archives-Salt: 6cd83054-719e-4a24-b9d0-3429c644ec60 X-Archives-Hash: dd9f99ae8a7c770dcd4c8d035572f84b 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 -- Thanks, Zac