1 |
On 08/01/2012 11:36 PM, Pacho Ramos wrote: |
2 |
> El mié, 01-08-2012 a las 16:14 -0700, Zac Medico escribió: |
3 |
>> On 08/01/2012 03:19 AM, Pacho Ramos wrote: |
4 |
>>> On every openrc update I get dispatch-conf wanting to revert all my |
5 |
>>> changes in /etc/conf.d files, like KEYMAP, clock... |
6 |
>>> |
7 |
>>> Is there any way to prevent it from doing that? |
8 |
>>> |
9 |
>>> Thanks a lot for the info |
10 |
>>> |
11 |
>> |
12 |
>> Maybe we can trace the behavior back to the diff3 command that it's |
13 |
>> using. Inside /usr/lib/portage/pym/portage/dispatch_conf.py we have this |
14 |
>> command: |
15 |
>> |
16 |
>> DIFF3_MERGE = "diff3 -mE '%s' '%s' '%s' > '%s'" |
17 |
>> |
18 |
>> Are you able to reproduce the problem by running this command manually? |
19 |
>> |
20 |
>> Something like this: |
21 |
>> |
22 |
>> diff3 -mR /etc/conf.d/hostname \ |
23 |
>> /etc/config-archive/etc/conf.d/hostname.dist \ |
24 |
>> /etc/conf.d/._cfg0000_hostname > /tmp/mrgconf |
25 |
> |
26 |
> I will probably need to reemerge it as I already merged changes and |
27 |
> re-edited config files. Anyway, diff3 looks to not admit -R option: |
28 |
> $ diff3 |
29 |
> -mR /etc/conf.d/hostname /etc/config-archive/etc/conf.d/hostname.dist /etc/conf.d/._cfg0000_hostname |
30 |
> diff3: opción inválida -- R |
31 |
> diff3: Pruebe `diff3 --help' para más información. |
32 |
|
33 |
Sorry, that -mR a typo. As you can see in the DIFF3_MERGE value above, |
34 |
it's diff -mE. |
35 |
-- |
36 |
Thanks, |
37 |
Zac |