On 08/01/2012 11:36 PM, Pacho Ramos wrote: > 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.
Sorry, that -mR a typo. As you can see in the DIFF3_MERGE value above, it's diff -mE. -- Thanks, Zac
