diff options
| author | Simon Rettberg | 2013-10-18 18:46:11 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-10-18 18:46:11 +0200 |
| commit | 5027bfbc817dc5620bbc222a47074f99bd340692 (patch) | |
| tree | c7e37f7f2e2f2c87aae2e5cdaa4f1c246b73e1fa /helper | |
| parent | [rootfs-stage32] Remove retarded $PATH declaration from /etc/profile (diff) | |
| parent | Merge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.tar.gz tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.tar.xz tm-scripts-5027bfbc817dc5620bbc222a47074f99bd340692.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/fileutil.inc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/helper/fileutil.inc b/helper/fileutil.inc index 9f5c110f..027f5404 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -38,10 +38,21 @@ list_packet_files() { [ "x$OPTIONAL" = "x@" ] && PACKAGE="$(echo "$PACKAGE" | cut -c 2-)" local FILES="" if [ "$PACKET_HANDLER" = "dpkg" ]; then - FILES="$(dpkg -L "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + PACKAGECOMMAND="dpkg -L" elif [ "$PACKET_HANDLER" = "rpm" ]; then - FILES="$(rpm -ql "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + PACKAGECOMMAND="rpm -ql" fi + + if [ -n "$REQUIRED_PACKET_FILES_BLACKLIST" ]; then + FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | \ + grep -v "$REQUIRED_PACKET_FILES_BLACKLIST" | \ + grep -v -E 'share/(man|doc)|/var/run|/var/log'; \ + echo ":###:${PIPESTATUS[0]}")" + else + FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + fi +# FILES="$(rpm -ql "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + # ugly hack to get our return value #local LPRET=$(echo "$FILES" | tail -1 | sed 's/^.*:###:\([0-9]*\)$/\1/g') #FILES=$(echo "$FILES" | sed 's/^\(.*\):###:[0-9]*$/\1/g') |