lzip/zutils
1
0
Fork 0
Code Issues Activity

Applying patch from Helmut Grohne <helmut@subdivi.de> to fix moving of diverted files again (Closes: #1105163).

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-05-12 18:51:47 +02:00
parent 5babd93d32
commit 4fa3918d9f
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
debian/zutils.preinst vendored
View file

@ -25,7 +25,11 @@ case "${1}" in
# We cannot run between gzip.preinst and gzip unpack. # We cannot run between gzip.preinst and gzip unpack.
GZIP_VERSION=$(dpkg-query -f '${Version}' -W gzip) GZIP_VERSION=$(dpkg-query -f '${Version}' -W gzip)
GZIP_PREFIX=/usr GZIP_PREFIX=/usr
dpkg --compare-versions "$GZIP_VERSION" lt 1.12-1.1~ && GZIP_PREFIX= GZIP_SUFFIX=
dpkg --compare-versions "$GZIP_VERSION" lt 1.12-1.1~ && {
GZIP_PREFIX=
GZIP_SUFFIX=.usr-is-merged
}
for FILE in zcat zcmp zdiff zegrep zfgrep zgrep for FILE in zcat zcmp zdiff zegrep zfgrep zgrep
do do
TRUENAME=$(dpkg-divert --truename "/usr/bin/${FILE}") TRUENAME=$(dpkg-divert --truename "/usr/bin/${FILE}")
@ -42,7 +46,7 @@ case "${1}" in
# on the gzip version. # on the gzip version.
dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/${FILE}.gzip" "/usr/bin/${FILE}" dpkg-divert --package zutils --quiet --add --no-rename --divert "/usr/bin/${FILE}.gzip" "/usr/bin/${FILE}"
dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/${FILE}.gzip.usr-is-merged" "/bin/${FILE}" dpkg-divert --package zutils --quiet --add --no-rename --divert "/bin/${FILE}.gzip.usr-is-merged" "/bin/${FILE}"
mv "${DPKG_ROOT:-}${TRUENAME}" "${DPKG_ROOT:-}${GZIP_PREFIX}/bin/${FILE}.gzip${GZIP_PREFIX:+.usr-is-merged}" mv "${DPKG_ROOT:-}${TRUENAME}" "${DPKG_ROOT:-}${GZIP_PREFIX}/bin/${FILE}.gzip${GZIP_SUFFIX}"
dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz dpkg-divert --package zutils --quiet --add --rename --divert /usr/share/man/man1/${FILE}.gzip.1.gz /usr/share/man/man1/${FILE}.1.gz
done done
;; ;;
@ -85,8 +89,14 @@ case "${1}" in
mv "${DPKG_ROOT}${TRUENAME}" "${DPKG_ROOT}/bin/${FILE}.gzip.usr-is-merged" mv "${DPKG_ROOT}${TRUENAME}" "${DPKG_ROOT}/bin/${FILE}.gzip.usr-is-merged"
fi fi
fi fi
elif [ "${TRUENAME}" != "/usr/bin/${FILE}.gzip" ] elif [ "${TRUENAME}" = "/usr/bin/${FILE}.gzip" ]
then then
# 1.14-4 wrongly moved files. Fix.
if [ -e "${DPKG_ROOT:-}/usr/bin/${FILE}.gzip.usr-is-merged" ] && ! [ -e "${DPKG_ROOT:-}/usr/bin/${FILE}.gzip" ]
then
mv "${DPKG_ROOT:-}/usr/bin/${FILE}.gzip.usr-is-merged" "${DPKG_ROOT:-}/usr/bin/${FILE}.gzip"
fi
else
die "unexpected diversion of /usr/bin/${FILE} to ${TRUENAME}" die "unexpected diversion of /usr/bin/${FILE} to ${TRUENAME}"
fi fi
done done