From 399251bc12efd30a3fa12c83c815e96d0e1cb8bd Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Aug 2013 18:41:58 +0200 Subject: [fileutil.inc] list_packet_files: Ignore output lines that do not start with a slash (e.g. dpkg messages about diverted files) --- helper/fileutil.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helper/fileutil.inc b/helper/fileutil.inc index c93e82b8..798f825a 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -38,9 +38,9 @@ list_packet_files() { [ "x$OPTIONAL" = "x@" ] && PACKAGE="$(echo "$PACKAGE" | cut -c 2-)" local FILES="" if [ "$PACKET_MANAGER" = "apt" ]; then - FILES="$(dpkg -L "$PACKAGE" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + FILES="$(dpkg -L "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" elif [ "$PACKET_MANAGER" = "zypper" -o "$PACKET_MANAGER" = "yum" ]; then - FILES="$(rpm -ql "$PACKAGE" | grep -v -E 'share/(doc|man)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + FILES="$(rpm -ql "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" fi # ugly hack to get our return value #local LPRET=$(echo "$FILES" | tail -1 | sed 's/^.*:###:\([0-9]*\)$/\1/g') -- cgit v1.2.3-55-g7522