Bug#925532: unblock: fish/3.0.2-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package fish
(explain the reason for the unblock here)
Fish's completion script for systemctl starts to print garbage on
the screen since systemd-241. This revision merely fixes the very
annoying behaviour.
Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925308
unblock fish/3.0.2-2
(include/attach the debdiff against the package in testing)
~/D/fish ❯❯❯ debdiff --diffstat fish_3.0.2-1.dsc fish_3.0.2-2.dsc
dpkg-source: warning: extracting unsigned source package (/home/lumin/Debian/fish/fish_3.0.2-2.dsc)
diffstat for fish-3.0.2 fish-3.0.2
changelog | 7 +++
patches/c6ec4235136e82c709e8d7b455f7c463f9714b48.diff | 33 ++++++++++++++++++
patches/series | 1
3 files changed, 41 insertions(+)
(...) dch diff truncated
diff -Nru fish-3.0.2/debian/patches/c6ec4235136e82c709e8d7b455f7c463f9714b48.diff fish-3.0.2/debian/patches/c6ec4235136e82c709e8d7b455f7c463f9714b48.diff
--- fish-3.0.2/debian/patches/c6ec4235136e82c709e8d7b455f7c463f9714b48.diff 1970-01-01 00:00:00.000000000 +0000
+++ fish-3.0.2/debian/patches/c6ec4235136e82c709e8d7b455f7c463f9714b48.diff 2019-03-26 13:14:08.000000000 +0000
@@ -0,0 +1,33 @@
+Source: https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48
+Fixes: https://github.com/fish-shell/fish-shell/issues/5689
+Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925308
+diff --git a/share/completions/systemctl.fish b/share/completions/systemctl.fish
+index e42c2aa63..eeeb58cf0 100644
+--- a/share/completions/systemctl.fish
++++ b/share/completions/systemctl.fish
+@@ -1,13 +1,13 @@
+-set -l systemd_version (systemctl --version | string match "systemd*" | string replace -r "\D*(\d+)" '$1')
++set -l systemd_version (systemctl --version | string match "systemd*" | string replace -r "\D*(\d+)\D.*" '$1')
+ set -l commands list-units list-sockets start stop reload restart try-restart reload-or-restart reload-or-try-restart \
+ isolate kill is-active is-failed status show get-cgroup-attr set-cgroup-attr unset-cgroup-attr set-cgroup help \
+ reset-failed list-unit-files enable disable is-enabled reenable preset mask unmask link load list-jobs cancel dump \
+ list-dependencies snapshot delete daemon-reload daemon-reexec show-environment set-environment unset-environment \
+ default rescue emergency halt poweroff reboot kexec exit suspend hibernate hybrid-sleep switch-root list-timers \
+ set-property
+-if test $systemd_version -gt 208
++if test $systemd_version -gt 208 2>/dev/null
+ set commands $commands cat
+- if test $systemd_version -gt 217
++ if test $systemd_version -gt 217 2>/dev/null
+ set commands $commands edit
+ end
+ end
+@@ -79,7 +79,7 @@ complete -f -c systemctl -l version -d 'Print a short version and exit'
+ complete -f -c systemctl -l no-pager -d 'Do not pipe output into a pager'
+
+ # New options since systemd 220
+-if test $systemd_version -gt 219
++if test $systemd_version -gt 219 2>/dev/null
+ complete -f -c systemctl -l firmware-setup -n "__fish_seen_subcommand_from reboot" -d "Reboot to EFI setup"
+ complete -f -c systemctl -l now -n "__fish_seen_subcommand_from enable" -d "Also start unit"
+ complete -f -c systemctl -l now -n "__fish_seen_subcommand_from disable mask" -d "Also stop unit"
diff -Nru fish-3.0.2/debian/patches/series fish-3.0.2/debian/patches/series
--- fish-3.0.2/debian/patches/series 2019-02-11 16:26:40.000000000 +0000
+++ fish-3.0.2/debian/patches/series 2019-03-26 13:16:52.000000000 +0000
@@ -1,3 +1,4 @@
use-system-python
isolate-home-tests
use-curdir-not-pwd
+c6ec4235136e82c709e8d7b455f7c463f9714b48.diff
-- System Information:
Debian Release: buster/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-4-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Reply to: