[gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Pacho Ramos]

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

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

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

[gentoo-portage-dev] Re: How to prevent dispatch-conf from reverting valid changes

[Duncan]

Pacho Ramos posted on Wed, 01 Aug 2012 12:19:20 +0200 as excerpted:

> 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

Interesting.  I use etc-update here, and at least it (working with 
portage) has a feature such that it takes the hash of the package's config 
file, and as long as that doesn't change, it won't bother you again.

Of course if there's a change in the package's config file, it simply 
diffs the files, thus returning hits for parts of the files that haven't 
changed since the last time if they differ, because some other chunk of 
the file is new (say one entirely new option in a file of dozens, the 
rest of which haven't changed).

Between that and the auto-merge-trivial-changes (which would appear to be 
comments in most cases) option, I don't get bothered /too/ often, tho it 
/would/ be nice if it could check individual sections within the file, 
spotting when they haven't changed, so it'd only bother me about the new 
option, not the dozen old options I've already customized.


Another technique that I find helps with some files that I've changed a 
lot, is to put all my changes (save for commenting the defaults where 
necessary, if later changes won't override but instead accumulate) in a 
section at the end.  That way, the main config is identical to the 
unchanged package config, so any changes to it immediately leap out, and 
I can take those changes to the boilerplate section, then edit the file 
afterward, making the corresponding changes to my custom section.

That tends to work pretty well, since I take all the changes upto the 
point where it switches to my custom config, then I refuse the change 
deleting it, and edit the file to make my custom changes based on the 
boilerplate changes just called to my attention.

-- 
Duncan - List replies preferred.   No HTML msgs.
"Every nonfree program has a lord, a master --
and if you use the program, he is your master."  Richard Stallman

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Zac Medico]

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

Re: [gentoo-portage-dev] Re: How to prevent dispatch-conf from reverting valid changes

[Zac Medico]

On 08/01/2012 08:33 AM, Duncan wrote:
> Pacho Ramos posted on Wed, 01 Aug 2012 12:19:20 +0200 as excerpted:
> 
>> 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
> 
> Interesting.  I use etc-update here, and at least it (working with 
> portage) has a feature such that it takes the hash of the package's config 
> file, and as long as that doesn't change, it won't bother you again.

This is actually a feature of portage's merge code, which can be
disabled by the emerge --noconfmem option.

> Of course if there's a change in the package's config file, it simply 
> diffs the files, thus returning hits for parts of the files that haven't 
> changed since the last time if they differ, because some other chunk of 
> the file is new (say one entirely new option in a file of dozens, the 
> rest of which haven't changed).

Unlike etc-update, dispatch-conf uses diff3.

-- 
Thanks,
Zac

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Pacho Ramos]

[-- 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 --]

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Zac Medico]

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

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Zac Medico]

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 you want to add those config files to frozen-files in
/etc/dispatch-conf.conf.

-- 
Thanks,
Zac

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Pacho Ramos]

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

El jue, 02-08-2012 a las 12:34 -0700, Zac Medico escribió:
> 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.

Will try on next openrc update :)

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

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Pacho Ramos]

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

El jue, 02-08-2012 a las 15:56 -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 you want to add those config files to frozen-files in
> /etc/dispatch-conf.conf.
> 

The problem is that I don't really want to have that files frozen (as
they could need important changes in future versions). What I expect if
dispatch-conf to skip changes like changing an uncommented line with a
commented line, or changing "YES" to "NO"... but it's probably difficult
to detect :|

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

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Pacho Ramos]

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

El mié, 12-09-2012 a las 22:05 +0200, Pacho Ramos escribió:
> El jue, 02-08-2012 a las 15:56 -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 you want to add those config files to frozen-files in
> > /etc/dispatch-conf.conf.
> > 
> 
> The problem is that I don't really want to have that files frozen (as
> they could need important changes in future versions). What I expect if
> dispatch-conf to skip changes like changing an uncommented line with a
> commented line, 

This looks like could be done with:
# Automerge files comprising only whitespace and/or comments
# (yes or no)
replace-wscomments=no

, setting it to "yes" in dispatch-conf.conf

> or changing "YES" to "NO"... but it's probably difficult
> to detect :|



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

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Zac Medico]

On 09/23/2012 03:59 AM, Pacho Ramos wrote:
> This looks like could be done with:
> # Automerge files comprising only whitespace and/or comments
> # (yes or no)
> replace-wscomments=no
> 
> , setting it to "yes" in dispatch-conf.conf

It seems like that option is only likely to benefit people who have
disabled the default config-protect-if-modified FEATURES setting, and
I'm not sure that it's a good idea to hide "trivial" differences from
these people by default.
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Pacho Ramos]

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

El dom, 23-09-2012 a las 11:06 -0700, Zac Medico escribió:
> On 09/23/2012 03:59 AM, Pacho Ramos wrote:
> > This looks like could be done with:
> > # Automerge files comprising only whitespace and/or comments
> > # (yes or no)
> > replace-wscomments=no
> > 
> > , setting it to "yes" in dispatch-conf.conf
> 
> It seems like that option is only likely to benefit people who have
> disabled the default config-protect-if-modified FEATURES setting, and
> I'm not sure that it's a good idea to hide "trivial" differences from
> these people by default.

Would be a way to detect changes like "0" to "1" or "false" -> "true",
"yes" -> "no"... ? I think they usually shouldn't be changed :|

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

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Zac Medico]

On 09/27/2012 01:16 PM, Pacho Ramos wrote:
> El dom, 23-09-2012 a las 11:06 -0700, Zac Medico escribió:
>> On 09/23/2012 03:59 AM, Pacho Ramos wrote:
>>> This looks like could be done with:
>>> # Automerge files comprising only whitespace and/or comments
>>> # (yes or no)
>>> replace-wscomments=no
>>>
>>> , setting it to "yes" in dispatch-conf.conf
>>
>> It seems like that option is only likely to benefit people who have
>> disabled the default config-protect-if-modified FEATURES setting, and
>> I'm not sure that it's a good idea to hide "trivial" differences from
>> these people by default.
> 
> Would be a way to detect changes like "0" to "1" or "false" -> "true",
> "yes" -> "no"... ? I think they usually shouldn't be changed :|

I'm not sure what "problem" you're trying to solve. Since enabling
FEATURES=config-protect-if-modified, I've found the volume of config
updates to be much more manageable, and the configs that I do have to
merge manually don't really bother me.
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Pacho Ramos]

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

El jue, 27-09-2012 a las 13:21 -0700, Zac Medico escribió:
> On 09/27/2012 01:16 PM, Pacho Ramos wrote:
> > El dom, 23-09-2012 a las 11:06 -0700, Zac Medico escribió:
> >> On 09/23/2012 03:59 AM, Pacho Ramos wrote:
> >>> This looks like could be done with:
> >>> # Automerge files comprising only whitespace and/or comments
> >>> # (yes or no)
> >>> replace-wscomments=no
> >>>
> >>> , setting it to "yes" in dispatch-conf.conf
> >>
> >> It seems like that option is only likely to benefit people who have
> >> disabled the default config-protect-if-modified FEATURES setting, and
> >> I'm not sure that it's a good idea to hide "trivial" differences from
> >> these people by default.
> > 
> > Would be a way to detect changes like "0" to "1" or "false" -> "true",
> > "yes" -> "no"... ? I think they usually shouldn't be changed :|
> 
> I'm not sure what "problem" you're trying to solve. Since enabling
> FEATURES=config-protect-if-modified, I've found the volume of config
> updates to be much more manageable, and the configs that I do have to
> merge manually don't really bother me.

Well, I hit the problem when updating from stable openrc to 0.10.5 and
needing to reedit some config files as, as normal, I had uncommented
some options, modified some defaults... (like keymap, clock settings...)

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

Re: [gentoo-portage-dev] How to prevent dispatch-conf from reverting valid changes

[Zac Medico]

On 09/27/2012 01:36 PM, Pacho Ramos wrote:
> El jue, 27-09-2012 a las 13:21 -0700, Zac Medico escribió:
>> On 09/27/2012 01:16 PM, Pacho Ramos wrote:
>>> El dom, 23-09-2012 a las 11:06 -0700, Zac Medico escribió:
>>>> On 09/23/2012 03:59 AM, Pacho Ramos wrote:
>>>>> This looks like could be done with:
>>>>> # Automerge files comprising only whitespace and/or comments
>>>>> # (yes or no)
>>>>> replace-wscomments=no
>>>>>
>>>>> , setting it to "yes" in dispatch-conf.conf
>>>>
>>>> It seems like that option is only likely to benefit people who have
>>>> disabled the default config-protect-if-modified FEATURES setting, and
>>>> I'm not sure that it's a good idea to hide "trivial" differences from
>>>> these people by default.
>>>
>>> Would be a way to detect changes like "0" to "1" or "false" -> "true",
>>> "yes" -> "no"... ? I think they usually shouldn't be changed :|
>>
>> I'm not sure what "problem" you're trying to solve. Since enabling
>> FEATURES=config-protect-if-modified, I've found the volume of config
>> updates to be much more manageable, and the configs that I do have to
>> merge manually don't really bother me.
> 
> Well, I hit the problem when updating from stable openrc to 0.10.5 and
> needing to reedit some config files as, as normal, I had uncommented
> some options, modified some defaults... (like keymap, clock settings...)

I think this comes back to a limitation of that DIFF3_MERGE command that
we discussed earlier in this thread, since it's failing to automatically
merge your local changes. If there's some better tool for doing the
merge, then make it so you can use that instead of diff3.
-- 
Thanks,
Zac