Managed files conflicting with Whonix packages

[ben-grande]

Software version

Latest is
008d961

but the error was made since the modification of the files occurred and are only being noticed now as the Whonix packages have updated.

Brief summary

Qusal and Whonix modifies /etc/gitconfig and /etc/skel/.gnupg/gpg.conf.

It affects only formulas that customize the Whonix templates.

The /etc/gitconfig I can try to negotiate to use drop-in configuration directory instead in case Whonix agrees to use include.path. GnuPG does not accept drop-in configuration and /etc/gnupg/gpg.conf is already owned by split-gpg2.

What I can do is add the qrexec protocol to the git dotfiles (dotfiles requirement) and not modify the /etc/skel/gnupg and other files when Whonix is detected:

$ dpkg -S /etc/gitconfig
security-misc: /etc/gitconfig

$ dpkg -S /etc/skel/.* 2>/dev/null
bash: /etc/skel/.bash_logout
diversion by whonix-base-files from: /etc/skel/.bashrc
diversion by whonix-base-files to: /etc/skel/.bashrc.whonix-orig
bash: /etc/skel/.bashrc
whonix-base-files: /etc/skel/.bashrc.whonix
diversion by whonix-base-files from: /etc/skel/.bashrc
diversion by whonix-base-files to: /etc/skel/.bashrc.whonix-orig
anon-ws-base-files, anon-apps-config, vm-config-dist, security-misc, usability-misc, desktop-config-dist: /etc/skel/.config
anon-apps-config, security-misc: /etc/skel/.gnupg
anon-apps-config: /etc/skel/.local
bash: /etc/skel/.profile
anon-apps-config: /etc/skel/.xchat2
desktop-config-dist: /etc/skel/.zshrc

Steps to reproduce

Install the sys-bitcoin or sys-git formula and reinstall the Whonix package owning the aforementioned files.

Expected behavior

Don't break updates.

Actual behavior

Updating fails and package installation depends on it and is skipped.

            ID: common-updated
      Function: pkg.uptodate
        Result: False
       Comment: Problem encountered upgrading packages. Additional info follows:

                result:
                    ----------
                    pid:
                        [REDACTED]
                    retcode:
                        100
                    stderr:
                        Running scope as unit: run-[REDACTED].scope
                        E: dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem.
                    stdout:
       Started: [REDACTED]
      Duration: [REDACTED] ms
       Changes:

$ dpkg --configure -a

Configuration file '/etc/skel/.gnupg/gpg.conf'
 ==> Modified (by you or by a script) since installation.
 ==> Package distributor has shipped an updated version.
   What would you like to do about it ?  Your options are:
    Y or I  : install the package maintainer's version
    N or O  : keep your currently-installed version
      D     : show the differences between the versions
      Z     : start a shell to examine the situation
 The default action is to keep your current version.
*** gpg.conf (Y/I/N/O/D/Z) [default=N] ? ^C