Your message dated Sun, 09 Jun 2024 07:48:58 +0000
with message-id <e1sgdiq-00acjj...@fasolo.debian.org>
and subject line Bug#1072732: fixed in debianutils 5.19
has caused the Debian Bug report #1072732,
regarding update-shells: duplicates entries when a package includes both 
aliased and canonical shells
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
1072732: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072732
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: debianutils
Version: 5.17
Tags: patch
X-Debbugs-Cc: jo...@debian.org
User: helm...@debian.org
Usertags: dep17

Hi,

a longer while ago I added update-shells to debianutils as a way of
managing /etc/shells using dpkg triggers. It took us a while to get the
interactions with /usr-merge right and it seems we're not done yet.

My recent bash upload changes it's shells.d snippet to include both
aliased and canonical shells, which is right in principle, but it causes
update-shells to duplicate /usr/bin/bash in /etc/shells. While that's
not breaking anything yet, it's also not nice and kudos to Johannes for
spotting it.

It also is easy to fix with the attached patch. Would you kindly apply
it?

Helmut
diff --minimal -Nru debianutils-5.17/debian/changelog 
debianutils-5.17+nmu1/debian/changelog
--- debianutils-5.17/debian/changelog   2024-03-01 20:08:45.000000000 +0100
+++ debianutils-5.17+nmu1/debian/changelog      2024-06-07 09:50:16.000000000 
+0200
@@ -1,3 +1,11 @@
+debianutils (5.17+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * update-shells: Avoid duplicate lines when package shells contain both
+    aliased and canonical shells. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 07 Jun 2024 09:50:16 +0200
+
 debianutils (5.17) unstable; urgency=medium
 
   [ Patrick BrĂ¼nn ]
diff --minimal -Nru debianutils-5.17/update-shells 
debianutils-5.17+nmu1/update-shells
--- debianutils-5.17/update-shells      2024-02-28 21:00:25.000000000 +0100
+++ debianutils-5.17+nmu1/update-shells 2024-06-07 09:48:53.000000000 +0200
@@ -79,10 +79,12 @@
        test -f "$f" || continue
        while IFS='#' read -r line _; do
                [ -n "$line" ] || continue
-               PKG_SHELLS="$PKG_SHELLS$line#"
+               if ! hashset_contains "$PKG_SHELLS" "$line"; then
+                       PKG_SHELLS="$PKG_SHELLS$line#"
+               fi
                realshell=$(dpkg-realpath --root "$ROOT" "$(dirname 
"$line")")/$(basename "$line")
-               if [ "$line" != "$realshell" ]; then
-                       PKG_SHELLS="$PKG_SHELLS$realshell#"
+               if ! hashset_contains "$PKG_SHELLS" "$realshell"; then
+                      PKG_SHELLS="$PKG_SHELLS$realshell#"
                fi
        done < "$f"
 done

--- End Message ---
--- Begin Message ---
Source: debianutils
Source-Version: 5.19
Done: Niels Thykier <ni...@thykier.net>

We believe that the bug you reported is fixed in the latest version of
debianutils, 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 1072...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Niels Thykier <ni...@thykier.net> (supplier of updated debianutils 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 ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 09 Jun 2024 07:25:40 +0000
Source: debianutils
Architecture: source
Version: 5.19
Distribution: unstable
Urgency: medium
Maintainer: Ileana Dumitrescu <ileanadumitresc...@gmail.com>
Changed-By: Niels Thykier <ni...@thykier.net>
Closes: 1072732
Changes:
 debianutils (5.19) unstable; urgency=medium
 .
   [ Helmut Grohne ]
   * update-shells: Avoid duplicate lines when package shells contain both
     aliased and canonical shells. (Closes: #1072732)
Checksums-Sha1:
 13f31ccac6ac4f13125719ae879d08c36dab57ef 1289 debianutils_5.19.dsc
 c0ec76f28d90ef805834f1422a31ee426e6c89d1 106276 debianutils_5.19.tar.xz
 d762482064a9ae740b46e8552aaf101ff092fc05 5358 debianutils_5.19_source.buildinfo
Checksums-Sha256:
 1b24cad834ba55af65e126c131d596ff5bc45e4110f4f76d72fa60383348fcaa 1289 
debianutils_5.19.dsc
 1f5552d3f7ecc811a37ba3a70a446bd988fdce64813a475f4038646d126b2019 106276 
debianutils_5.19.tar.xz
 4637f8766d08b8057fa3667c2957b4d8fe35b38cd3a829b12fcc297389f4f089 5358 
debianutils_5.19_source.buildinfo
Files:
 8f39e342a9759129d05821a045c6f69d 1289 utils required debianutils_5.19.dsc
 9a4f86871de3a400851998b452411f13 106276 utils required debianutils_5.19.tar.xz
 8fe060e87fb3ec1659e10bffc44eec46 5358 utils required 
debianutils_5.19_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEE9ecZmu9eXGflVYc/dA1oiINl0okFAmZlWWcACgkQdA1oiINl
0omfggf9G3i/dosw9oZFK7G2RJpMuKyQ5dzXaAFXwRkNHIm4AsuFxDufht6QmagG
14mpeftsT/7T0QxsvW97WZuP94LdAGFy9Z3lxRBiWHpTyCRDBJeDt472IdtldJum
dxL6biMNXNca/RTzJuTngdD7NsP/AtNGsJqEA6VqlMYiAocHdGCBKLuguTgWcNK2
QpNIjvVxUtPzzeBj5aOqyayPnZ/S6lKXyG8CpY8eHg8uvjQXTEGbMgMfXrRcGWCV
wGq6YEcj3lTHyaLvSJPRMgVHYz5hkOH3U1WFNoMhmMsMEGuZRpoItgzpNPJ9PGN4
6y/NrxClm4fdm+5x6LIHr8RER3BHWA==
=ER9q
-----END PGP SIGNATURE-----

Attachment: pgprR0pJsBZgD.pgp
Description: PGP signature


--- End Message ---

Reply via email to