#1011545 please version the Conflicts: with gitsome

Package:
gh
Source:
gh
Description:
GitHub CLI, GitHub’s official command line tool
Submitter:
Antoine Beaupre
Date:
2022-06-02 13:51:05 UTC
Severity:
important
#1011545#5
Date:
2022-05-24 19:46:39 UTC
From:
To:
I have fixed gitsome so that it doesn't ship a /usr/bin/gh binary in
gitsome/0.8.0+ds-7.1 (which closed #1005858). Please fix the
Conflicts: so that it is versioned << 0.8.0+ds-7.1.

This is marked as "serious" because I believe that conflicting with an
unrelated package is a policy violation. I understand this is somewhat
open to interpretation, but since this package has been added to the
blocking hints anyways, I figured it was better to file an RC bug,
remove the hint, and fix this, than keeping things kind of hidden the
way they are now. :)

#1011545#8
Date:
2022-05-31 15:31:54 UTC
From:
To:
Hello,

Bug #1011545 in gh reported by you has been fixed in the
Git repository and is awaiting an upload. You can see the commit
message below and you can check the diff of the fix at:

https://salsa.debian.org/go-team/packages/gh/-/commit/35e742ac631053fa0f5c54395efa473652b5a3b6
Closes: #1011545
Thanks: Antoine Beaupre for the suggestion, and for resolving the file conflict with gitsome (#1005858) so amicably!
------------------------------------------------------------------------

(this message was generated automatically)
-- 
Greetings

https://bugs.debian.org/1011545

#1011545#15
Date:
2022-05-31 15:49:21 UTC
From:
To:
We believe that the bug you reported is fixed in the latest version of
gh, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1011545@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Anthony Fok <foka@debian.org> (supplier of updated gh package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Tue, 31 May 2022 01:58:33 -0600
Source: gh
Architecture: source
Version: 2.4.0+dfsg1-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
Changed-By: Anthony Fok <foka@debian.org>
Closes: 1008761 1011545
Changes:
 gh (2.4.0+dfsg1-3) unstable; urgency=medium
 .
   * Limit "Conflicts: gitsome" to older (<< 0.8.0+ds-7.1) versions.
     Thanks to Antoine Beaupre for the suggestion, and for resolving the
     file conflict with gitsome (#1005858) so amicably! (Closes: #1011545)
   * Change default editor from nano to /usr/bin/editor as per Debian Policy
     §11.4. Thanks to Jakub Wilk for the bug report. (Closes: #1008761)
   * Rename "Build-Using" field to "Static-Build-Using" in debian/control
   * Add diversion for /usr/bin/gh to allow concurrent install with gitsome
     and remove Conflicts with gitsome. This is inspired by the conflict
     resolution between the moreutils and parallel packages where both
     contain /usr/bin/parallel.  See discussions in #749355.
Checksums-Sha1:
 1092d879dbffd7d271b7fea3191a511b8b721086 3914 gh_2.4.0+dfsg1-3.dsc
 c563c649ee6d53af12f8f0b3aa96ed7ffd38e449 940048 gh_2.4.0+dfsg1-3.debian.tar.xz
 22ce340f153035ba9c31b4caee0303686279d6d2 12875 gh_2.4.0+dfsg1-3_amd64.buildinfo
Checksums-Sha256:
 80c5e5b02c9c08368844d664be37d0efa8dd3042a94aa9fec21245ae8bc7bf19 3914 gh_2.4.0+dfsg1-3.dsc
 73bc2982038e0591645b097206394ce0c9cf8ec76bea81bac7ecc3f98d3b04d6 940048 gh_2.4.0+dfsg1-3.debian.tar.xz
 338bbbcbb80aedd05607ae6c2a7c8f5e93bb8d74be6e713b3329d6c71b158725 12875 gh_2.4.0+dfsg1-3_amd64.buildinfo
Files:
 faf8dbe284cccd7fc02d4c4d749450ef 3914 golang optional gh_2.4.0+dfsg1-3.dsc
 28794e83d36e6b935976254736cdfcbd 940048 golang optional gh_2.4.0+dfsg1-3.debian.tar.xz
 7e1b70f938b6d7f4f0fe3ccdc86cb1ae 12875 golang optional gh_2.4.0+dfsg1-3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----

iQJEBAEBCAAuFiEEFCQhsZrUqVmW+VBy6iUAtBLFms8FAmKWNO4QHGZva2FAZGVi
aWFuLm9yZwAKCRDqJQC0EsWaz/xAD/9RtxjOETIInSGTEbCNDE4U/k/F2y5T11Ki
zUMk0bF6O8zXMwWGsDI8zo35WIMA8O1SHQj2tD/Odr1gDs6CN4YZE7fMCnRBxYWe
HPgkPv+rUIHnsAdvQI1ER+grqb8uytvnd+baBIolr/7z+Br2kKAHFN5Qst7l3Et6
QOwa4uPbPVc6iMI6l0ETK6GSqGhRsOkmU39xnqPeKBU6qreqnYTJ5SOwLFRq6xaJ
vdPq4jlSuniodv2SjEcNgB4bPbjOvU83/4fm2GDMGzJUsM/wEe6dBqaxQ1Yuuo9U
69o1aoL7vq2rStm3Xd5l3q8SMYv1m3g/wji2QzqwAoecFwrC9tYwcOjQBxIoCHIb
Rv+x9QG+J9LUkVAGML7fhpl319ciiyLKw/P7vr2koUTUZSivpVLclf5iE+QxTZ3B
mfprVAtSHsMoqC/7r6H+C4jxa478J+GJ7vHs5byXoTplV0kUagESLhIFfydll5h9
72vhgFvFwQNmcZkQDADbKNs6nNXdd1x2wNm7EIlNSNDUm0Pcs6qxyvzF0U8ehbUd
v7ruZeNaZNX4sihCNQ4lXXzUfisnLa83AffFK7E2d3/ST7GuvAbQRRy9W8EBh2yB
4La7biR6p3WTW5yWA9U8Y/ARV0LmZG7BOO1hEYWOHsTVknjQhqwODDFcz241cd1o
UvseDk8lrw==
=93Ze
-----END PGP SIGNATURE-----

#1011545#20
Date:
2022-05-31 15:57:56 UTC
From:
To:
    * Add diversion for /usr/bin/gh to allow concurrent install with gitsome
      and remove Conflicts with gitsome. This is inspired by the conflict
      resolution between the moreutils and parallel packages where both
      contain /usr/bin/parallel.  See discussions in #749355.

This seems like it's the opposite of what I was suggesting in the bug
report (#1011545). And you even refer to that bug report in the
changelog:

    * Limit "Conflicts: gitsome" to older (<< 0.8.0+ds-7.1) versions.
      Thanks to Antoine Beaupre for the suggestion, and for resolving the
      file conflict with gitsome (#1005858) so amicably! (Closes: #1011545)

What actually happened, from what I can tell, is that you just removed
the Conflicts... I don't think that's the right resolution here: gitsome
has been fixed, in unstable, and gh doesn't need to go around with fancy
diversion stuff, because we're *precisely* not in a situation like
moreutils and parallel...

Could this change be reverted?

#1011545#25
Date:
2022-06-01 22:30:55 UTC
From:
To:
Hi Antoine!

Thank you for your quick response!

This is an idea that has been brewing in my mind some weeks ever since
I came to realize Debian has two "parallel" programs while working on
<https://github.com/OpenDRR/earthquake-scenarios/pull/61>, and thought
to myself, if moreutils and (GNU) parallel can do it, why can't
gitsome and (GitHub's) gh?

But I was too busy with work, and also not sure how to break the file
conflict deadlock in #1005858 (especially with the manual block to
both packages), so I didn't act on it.
Many thanks to you for getting us out of that embarrassing situation!

So, as I was dealing with this new bug that you opened, my old idea
came back to me again, I decided to give it a try, for better or for
worse.  The changelog is a reflection of the Git commits that I made
in that order...  <grin>

Thank you for clarifying to me that it is a different situation than
moreutils and parallel.

From my understanding of the gitsome, the "gitsome" command itself is
mostly just a wrapper that calls xonsh, and gitsome's main
functionalities are actually in the "/usr/bin/gh" Python executable,
so perhaps removing /usr/bin/gh altogether in some sense cripples the
gitsome package, and a rename to /usr/bin/gh.gitsome or something else
would be more appropriate.

That said, I now agree with you that renaming gitsome's /usr/bin/gh
via dpkg-divert from GitHub CLI gh package is not the right way to go,
particularly because the /usr/bin/gh meaning different things
depending on which packages are installed (just gitsome or both
gitsome and gh) can be very confusing.)

Yes, most definitely!  I will do it ASAP.

After that, I will probably try to work on the gitsome package too and
install its gh as /usr/bin/gh.gitsome and hopefully get its
command-line completion to work with the name change, but that's
unrelated to this particular bug report and to GitHub CLI gh.  Let's
keep this package clean and free of the fancy and confusing diversion
stuff.  :-)

Thanks again for writing to me and put some common sense back into me!

Cheers,

Anthony Fok

#1011545#34
Date:
2022-06-01 23:01:33 UTC
From:
To:
Hello,

Bug #1011545 in gh reported by you has been fixed in the
Git repository and is awaiting an upload. You can see the commit
message below and you can check the diff of the fix at:

https://salsa.debian.org/go-team/packages/gh/-/commit/25bd8128cfc88374bb1fcc5c4e2928b86eef4186
------------------------------------------------------------------------
Revert "Add diversion for /usr/bin/gh to allow concurrent install with gitsome"

And restore the versioned Conflicts with gitsome.

This reverts commit d06896e22cc6f052ec6167138d2435db795a2433.

Thanks: Antoine Beaupré for talking some sense into me.
Closes: #1011545
------------------------------------------------------------------------

(this message was generated automatically)
-- 
Greetings

https://bugs.debian.org/1011545

#1011545#41
Date:
2022-06-01 23:18:49 UTC
From:
To:
We believe that the bug you reported is fixed in the latest version of
gh, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1011545@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Anthony Fok <foka@debian.org> (supplier of updated gh package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Wed, 01 Jun 2022 16:55:59 -0600
Source: gh
Architecture: source
Version: 2.4.0+dfsg1-4
Distribution: unstable
Urgency: medium
Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
Changed-By: Anthony Fok <foka@debian.org>
Closes: 1011545
Changes:
 gh (2.4.0+dfsg1-4) unstable; urgency=medium
 .
   * Revert "Add diversion for /usr/bin/gh to allow concurrent install
     with gitsome", and restore the versioned Conflicts with gitsome.
     Thanks to Antoine Beaupré for talking some sense into me especially
     this case is not like moreutils and parallel. (Closes: #1011545)
Checksums-Sha1:
 1fb4821656a8d523f510cc214d9818b39e46f6cc 3914 gh_2.4.0+dfsg1-4.dsc
 cc4d107659547bc632cb7792207acd92566bcae2 939172 gh_2.4.0+dfsg1-4.debian.tar.xz
 28ed7d9766bd7417fba26fc8cec14b8d583cb463 12875 gh_2.4.0+dfsg1-4_amd64.buildinfo
Checksums-Sha256:
 841d223855781ae47c9297234c6b94a33470feef5c9ee6f0589213de450da845 3914 gh_2.4.0+dfsg1-4.dsc
 8d5b172c8cb23b4bd14778f2e95dfff41a568ff6a0b9fba53195539f46d73df7 939172 gh_2.4.0+dfsg1-4.debian.tar.xz
 b06640a2e58ac944148971d82839bd13393091f52d9664114005e9d3e986e1b7 12875 gh_2.4.0+dfsg1-4_amd64.buildinfo
Files:
 31226ed668427c9a6fd93e1b1e2f544d 3914 golang optional gh_2.4.0+dfsg1-4.dsc
 ce1d447eee8e86f0c1412aab4ce50137 939172 golang optional gh_2.4.0+dfsg1-4.debian.tar.xz
 eea216d07178a9cfa356d121606594d0 12875 golang optional gh_2.4.0+dfsg1-4_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----

iQJEBAEBCAAuFiEEFCQhsZrUqVmW+VBy6iUAtBLFms8FAmKX784QHGZva2FAZGVi
aWFuLm9yZwAKCRDqJQC0EsWazx5LD/wL5RrZcfAQc7ccBmDbCjxZ9ROc5tO7Xwdq
1pkY4w9s/0I6IpMAGW10awK0qcF8+cw+aNnH+mfaqj5iCjiUuKNUVa+6tSILLAcZ
EKhPLFQnsWyljkl67eF3W00ZnHth0Ft4q8j1/ew39HtMOFPFCGEcmv/yCKupGcyo
ZCn3PpJQqgSNuldZIqB/yhTKNrOcKLpBuN6nJIHA7pg9O4AU70udzyTSMJ1B2UcW
oW1GkyT09F7k/+9K4O+yNk4lvFnN843IzhHaGue6xmurCOdSdMHdhAnRSjE0ZuXK
J6h6bI3+YsBqj8hGZsZkuoz9myDP49tSuhEG4i87gRiBHe0fqWgM1M8WCFI2uInX
q0H0Owc7/Pyp+Zqw4Mo6t76Ej0TM5G/lkzoayqc+k1dkFevojaC2qCRTvHQqqKZ5
xuBFfWXFS06jpPsNVP6R7qXX2rnV6ijlXeREgO7fY5FvmTscAIxM9h7XRGnat72n
l8jpJDgA8SX2cog5purpbp+iZjfCTvZXKX8sy3p4gxYO9RFRyVeVBP+x2FAYPExU
zsc6u2vOW8lfMPBdEDEzcHyfm3SmE841d+sUrNccrUCFLQumHxJ6zpWlCyScO86P
TPrqh+tV09EBQ+FLmhi5TyR3PAgkYsUq9eTS3JT+Cb6PSuMA3javk2Az/IhbbBI8
MnDVIY/yeQ==
=EmGw
-----END PGP SIGNATURE-----

#1011545#46
Date:
2022-06-02 13:47:40 UTC
From:
To:
[...]

I see, I hadn't realized that. I thought gh was kind of a vanity shim,
not a different functionality.

[...]

Thanks!

I am not sure you should get invested deeply into gitsome. Upstream
seems inactive and you'd be basically working on your own fork...

Bah... "common sense", it's super complicated, and there's no easy
solution for stuff like this...

a.