From e38a7b2bef2de0590aeb8e443d70502148426730 Mon Sep 17 00:00:00 2001 From: mirabilos Date: Sun, 11 Nov 2018 14:50:54 +0100 Subject: [PATCH] fix invocation to work on all chroots we can currently build for MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dpkg-query’s -f option was introduced past sarge --- pbuilder-checkparams | 2 +- pbuilder-modules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 914ff4b8..a37e23e6 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -391,7 +391,7 @@ if [ -z "${CHROOTEXEC}" ]; then if [ "$USECGROUP" = "yes" ]; then # v215 is required for systemd-escape if systemctl is-system-running --quiet >/dev/null 2>&1 && \ - dpkg --compare-versions "$(dpkg-query -W -f '${Version}' systemd)" gt 215; then + dpkg --compare-versions "$(dpkg-query -W --showformat='${Version}' systemd)" gt 215; then # --description uses that no-spaces string because the quoting sucks # right now, and it would end up trying to execuse $PBUILDER_OPERATION… # long-term solution is to turn $CHROOTEXEC into a command and properly diff --git a/pbuilder-modules b/pbuilder-modules index d1099e9a..e2deb526 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -194,7 +194,7 @@ is_empty_dir() { # $2 → minimum version # success if pkg has an higher version, fail otherwise package_version_is_older_than() { - dpkg --compare-versions "$($CHROOTEXEC dpkg-query -W -f '${Version}' "$1")" lt "$2" + dpkg --compare-versions "$($CHROOTEXEC dpkg-query -W --showformat='${Version}' "$1")" lt "$2" return $? } -- GitLab