diff options
| author | Simon Rettberg | 2013-06-13 10:50:43 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-13 10:50:43 +0200 |
| commit | d7af304214a03f0bfe9c4403f332cfc7d085ec0f (patch) | |
| tree | c4267982168437fb1258e2617c4ccc2cbe538c83 /helper | |
| parent | [kdm] configure kdm to use systemd shutdown functionality. shutdown/reboot ou... (diff) | |
| download | tm-scripts-d7af304214a03f0bfe9c4403f332cfc7d085ec0f.tar.gz tm-scripts-d7af304214a03f0bfe9c4403f332cfc7d085ec0f.tar.xz tm-scripts-d7af304214a03f0bfe9c4403f332cfc7d085ec0f.zip | |
[alsa] Seems package names are different on SUSE after all...
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/fileutil.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/helper/fileutil.inc b/helper/fileutil.inc index 9a3c5aff..ec5c9319 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -51,14 +51,17 @@ list_packet_files() { if [ "$PACKET_MANAGER" = "apt" ]; then FILES="$(dpkg -L "$PACKAGE" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" elif [ "$PACKET_MANAGER" = "zypper" ]; then - FILES="$(rpm -ql "$PACKAGE" | grep -v -E 'share/(doc|man)|/var/run|/var/log' | grep -v share/man; echo ":###:${PIPESTATUS[0]}")" + FILES="$(rpm -ql "$PACKAGE" | grep -v -E 'share/(doc|man)|/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') #FILES=$(echo "$FILES" | sed 's/^\(.*\):###:[0-9]*$/\1/g') local LPRET=$(echo "$FILES" | awk -F ':###:' '{printf $2}') FILES=$(echo "$FILES" | awk -F ':###:' '{print $1}') - [ "x$LPRET" != "x0" -a "x$OPTIONAL" != "x@" ] && perror "dpkg/rpm existed with code '$LPRET' for required package ${PACKAGE}." + if [ "x$LPRET" != "x0" -a "x$OPTIONAL" != "x@" ]; then + pdebug "FILES: '$FILES'" + perror "dpkg/rpm exited with code '$LPRET' for required package ${PACKAGE}." + fi [ "x$LPRET" != "x0" ] && pwarning "dpkg/rpm exited with code '$LPRET' for optional package ${PACKAGE}." && continue [ -z "$FILES" ] && pwarning "list_packet_files empty for packet ${PACKAGE}." && continue pdebug "Packet $PACKAGE has $(echo $FILES | wc -w) files..." |