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 --- debian/squeeze/tdebase/debian/ksmserver-trinity.preinst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'debian/squeeze/tdebase') diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst index 4a2ab8a19..503524a11 100644 --- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst +++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst @@ -6,8 +6,14 @@ case "$1" in upgrade) # Remove old-style Plasma diversions - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true + divert=`dpkg-divert --listpackage "/usr/bin/plasma"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma + fi + divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop + fi mkdir -p /usr/share/autostart ;; -- cgit v1.2.1