Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 910560 - sys-apps/portage-3.0.49-r1: dispatch-conf diff doesn't work
Summary: sys-apps/portage-3.0.49-r1: dispatch-conf diff doesn't work
Status: UNCONFIRMED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Portage team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-07-19 18:28 UTC by Sotir Danailov
Modified: 2023-07-22 21:43 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Sotir Danailov 2023-07-19 18:28:16 UTC
When trying to use the diff command on any config file for which there was a change during an update, it doesn't do anything. I have to manually diff the ._cfg file and the current config always and replace them that way.

Reproducible: Always
Comment 1 Mike Gilbert gentoo-dev 2023-07-20 17:27:37 UTC
dispatch-conf does not have a "diff" command. Do you mean "merge" (m)?
Comment 2 Sotir Danailov 2023-07-21 13:41:16 UTC
(In reply to Mike Gilbert from comment #1)
> dispatch-conf does not have a "diff" command. Do you mean "merge" (m)?

https://gitweb.gentoo.org/proj/portage.git/tree/bin/dispatch-conf#n512
Comment 3 Mike Gilbert gentoo-dev 2023-07-21 14:26:30 UTC
Ah, so the "l" command. It works fine for me.

Have you customized /etc/dispatch-conf.conf at all?

Any strange pager settings (LESS env var)?
Comment 4 Sotir Danailov 2023-07-22 20:19:13 UTC
> Have you customized /etc/dispatch-conf.conf at all?

No I haven't.

> Any strange pager settings (LESS env var)?

These are my less settings from the env var "-R -M --shift 5".

Also is my assumption about the "l" command correct? I expect it to show me the diff between ._cfg0000_filename and filename.
Comment 5 Mike Gilbert gentoo-dev 2023-07-22 21:11:31 UTC
I think the "l" command is only useful after you have run the "m" (merge) command.

Running "l" after "m" should produce output like this:

> --- /etc/._cfg0000_mlocate-cron.conf    2023-07-21 10:24:26.783493956 -0400
> +++ /etc/._mrg0000_mlocate-cron.conf    2023-07-22 17:08:44.085754978 -0400
> @@ -3,7 +3,7 @@
>  
>  # ionice class to run at: see -c in ionice(1)
>  # you have to install sys-apps/util-linux manually
> -IONICE_CLASS="4"
> +IONICE_CLASS="2"
>  
>  # ionice priority to run at: see -n in ionice(1)
>  IONICE_PRIORITY="7"
> 
> >> (1 of 1) -- /etc/mlocate-cron.conf
> >> q quit, h help, n next, e edit-new, z zap-new, u use-new
>    m merge, t toggle-merge, l look-merge:
Comment 6 Mike Gilbert gentoo-dev 2023-07-22 21:17:11 UTC
Also, dispatch-conf should immediately show you a diff as soon as you run it. No explicit command is requited. That output should look like this:

> --- /etc/mlocate-cron.conf      2020-04-12 12:00:36.143350196 -0400
> +++ /etc/._cfg0000_mlocate-cron.conf    2023-07-22 17:15:07.618235065 -0400
> @@ -5,5 +5,7 @@
>  # you have to install sys-apps/util-linux manually
>  IONICE_CLASS="2"
>  
> +# some new setting
> +
>  # ionice priority to run at: see -n in ionice(1)
>  IONICE_PRIORITY="7"
> 
> >> (1 of 1) -- /etc/mlocate-cron.conf
> >> q quit, h help, n next, e edit-new, z zap-new, u use-new
>    m merge, t toggle-merge, l look-merge:
Comment 7 Sotir Danailov 2023-07-22 21:21:22 UTC
> Also, dispatch-conf should immediately show you a diff as soon as you run it.

Interesting, this doesn't happen in my case. I just directly get the output:

> >> (1 of 1) -- /etc/mlocate-cron.conf
> >> q quit, h help, n next, e edit-new, z zap-new, u use-new
>    m merge, t toggle-merge, l look-merge:

and nothing else.
Comment 8 Mike Gilbert gentoo-dev 2023-07-22 21:31:34 UTC
Does it work if you bypass less by setting PAGER=cat?

eg. PAGER=cat dispatch-conf
Comment 9 Sotir Danailov 2023-07-22 21:43:56 UTC
> Does it work if you bypass less by setting PAGER=cat?

It doesn't and changing the setting as pager="cat" in /etc/dispatch-conf.conf doesn't do anything either.