From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 10 Jun 2025 17:04:08 +0000 (-0400)
Subject: debian: fix typo in fuse2fs.postrm which breaks a /usr-move mitigation
X-Git-Tag: v1.47.3-rc2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b539a0370777feaa5652fd42d32fc66b2cea8788;p=thirdparty%2Fe2fsprogs.git

debian: fix typo in fuse2fs.postrm which breaks a /usr-move mitigation

A space was accidenally introduced into the fuse2fs.postrm which
breaks the /usr-move replacement of fusext2 from an older legacy
package that had been abandoned upstream.  Specifically, what was
broken was the cleanup of the protective diversions:

Unpacking fuse2fs (1.47.2-2) over (1.47.2-1+b1) ...
/var/lib/dpkg/info/fuse2fs.postrm: 6: test: failed-upgrade: unexpected operator

Addresses-Debian-Bug: #1107595
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/debian/fuse2fs.postrm b/debian/fuse2fs.postrm
index 68a43f8e..697739ac 100644
--- a/debian/fuse2fs.postrm
+++ b/debian/fuse2fs.postrm
@@ -3,7 +3,7 @@
 set -e
 
 # begin-remove-after: released:trixie
-if test "$1" = remove || test "$1" = upgrade -o "$1" = failed-upgrade - o "$1" = abort-install -o "$1" = abort-upgrade && dpkg --compare-versions "$2" lt 1.47.2~rc1-1~; then
+if test "$1" = remove || test "$1" = upgrade -o "$1" = failed-upgrade -o "$1" = abort-install -o "$1" = abort-upgrade && dpkg --compare-versions "$2" lt 1.47.2~rc1-1~; then
     # DEP17 P1 mitigation.
     for cmd in /sbin/mount.fuse-ext2 /sbin/mount.fuseext2; do
         dpkg-divert --package fuse2fs --no-rename --divert "$cmd.usr-is-merged" --remove "$cmd"