From 3532fa0b18ddff6a8f5147b7ce0864230f5d6bee Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.reczey@canonical.com>
Date: Tue, 26 Sep 2017 22:39:09 -0400
Subject: [PATCH] Use "dpkg --verify-format rpm" explicitly to be safe when the
 default changes

---
 live-build/auto/build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index cad466ad..59a4cfe3 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -91,9 +91,9 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp
     echo "Reinstalling packages with files in /usr/share/man/ ..."
     dpkg -S /usr/share/man/ |sed 's|, |\n|g;s|: [^:]*$||' | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
     echo "Reinstalling packages with system documentation in /usr/share/doc/ .."
-    dpkg --verify | awk '/..5......   \/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \
+    dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \
          | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
-    if dpkg --verify > /dev/null; then
+    if dpkg --verify --verify-format rpm> /dev/null; then
        echo "Documentation has been restored successfully."
        rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
     fi