diff options
author | Niels Thykier <niels@thykier.net> | 2019-07-21 18:41:55 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2019-07-21 18:41:55 +0000 |
commit | 9462d4a589889ada66a938f16486ef57d2e1be7e (patch) | |
tree | b64f6d86a9f08102540659c31b37c1fa3e02237d | |
parent | cda77b19e43a00d29e43d4191ec92ecd40d6b850 (diff) | |
download | debhelper-9462d4a589889ada66a938f16486ef57d2e1be7e.tar.gz |
dh_installsystemduser: Fix bug in sorting of unit files
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r-- | debian/changelog | 9 | ||||
-rwxr-xr-x | dh_installsystemduser | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 92972c11..9a6663fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -debhelper (12.2.4) UNRELEASED; urgency=medium +debhelper (12.2.5) UNRELEASED; urgency=medium [ Translations ] * Update Portuguese translation (Américo Monteiro) (Closes: #927394) - -- Niels Thykier <niels@thykier.net> Sat, 20 Jul 2019 07:20:56 +0000 + [ Niels Thykier ] + * dh_installsystemduser: Fix bug that would neuter sorting of unit + files and make the resulting maintscripts unreproducible. Thanks + to Daniel Kahn Gillmor for reporting the bug. (Closes: #932646) + + -- Niels Thykier <niels@thykier.net> Sun, 21 Jul 2019 18:40:38 +0000 debhelper (12.2.3) unstable; urgency=medium diff --git a/dh_installsystemduser b/dh_installsystemduser index bc1d0368..cd9ee12c 100755 --- a/dh_installsystemduser +++ b/dh_installsystemduser @@ -244,7 +244,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { push @enable_units, $name if contains_install_section($path); } - @enable_units = map { quote($_) } sort uniq @enable_units; + @enable_units = map { quote($_) } sort(uniq(@enable_units)); if (@enable_units) { # The generated maintainer script code blocks use the --user |