From 730df33c514f3f07144abfc979f08a7127ed0de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Dec 2013 19:58:52 +0100 Subject: Fix removing diverts from renamed packages on Debian and Ubuntu --- .../applications/tdeio-umountwrapper/debian/preinst | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'ubuntu/maverick/applications/tdeio-umountwrapper/debian/preinst') diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/preinst b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/preinst index a4d27d2cd..a258f8481 100644 --- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/preinst +++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/preinst @@ -30,9 +30,18 @@ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in install) # remove old diversions if present - dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop || true - dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop || true - dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop || true + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop + fi # add new diversions dpkg-divert --package $package_name \ -- cgit v1.2.1