From 74867c90f40c9d915bbccf08c94e4b5b3bb8d86c Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Wed, 12 Aug 2020 22:58:54 +0300 Subject: [PATCH] mk-sbuild: Fix a check for TARGET_ARCH in a message. Closes: #968316 Signed-off-by: Mattia Rizzolo --- debian/changelog | 5 +++++ mk-sbuild | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a8c8f74..4ac2b9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ ubuntu-dev-tools (0.187) UNRELEASED; urgency=medium * mk-sbuild: + Add support for zfs-snapshot schroots. LP: #1945349 + [ Mattia Rizzolo ] + * mk-sbuild: + + Apply patch from Peter Pentchev to avoid a broken log message. + Closes: #968316 + -- Mattia Rizzolo Sun, 31 Oct 2021 16:24:56 +0100 ubuntu-dev-tools (0.186) unstable; urgency=medium diff --git a/mk-sbuild b/mk-sbuild index 58d006b..26cbf20 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -1053,7 +1053,7 @@ echo "" echo " To CHANGE the golden image: sudo schroot -c source:${CHROOT_NAME} -u root" echo " To ENTER an image snapshot: schroot -c ${CHROOT_NAME}" echo " To BUILD within a snapshot: sbuild -A -d ${CHROOT_NAME} PACKAGE*.dsc" -if [ "$CHROOT_ARCH" != "$TARGET_ARCH" ] ; then +if [ -n "$TARGET_ARCH" ] && [ "$CHROOT_ARCH" != "$TARGET_ARCH" ] ; then echo " To BUILD for ${TARGET_ARCH}: sbuild -A -d ${CHROOT_NAME} --host ${TARGET_ARCH} PACKAGE*.dsc" fi echo ""