From 683152f3b286a04a76f31ee1eed839bbdb2ab307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 15 Feb 2013 16:59:06 +0100 Subject: Fix handling of diverts on Debian and Ubuntu --- ubuntu/maverick/applications/tdesudo/debian/postinst | 2 -- ubuntu/maverick/applications/tdesudo/debian/preinst | 13 ++++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'ubuntu/maverick/applications/tdesudo') diff --git a/ubuntu/maverick/applications/tdesudo/debian/postinst b/ubuntu/maverick/applications/tdesudo/debian/postinst index 9164f9d4a..5269ffae5 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/postinst +++ b/ubuntu/maverick/applications/tdesudo/debian/postinst @@ -11,8 +11,6 @@ fi case "$1" in configure) - dpkg-divert --package $package_name --rename --remove \ - /usr/trinity/bin/tdesu || true ;; abort-upgrade) ;; diff --git a/ubuntu/maverick/applications/tdesudo/debian/preinst b/ubuntu/maverick/applications/tdesudo/debian/preinst index a13492559..770dfaacb 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/preinst +++ b/ubuntu/maverick/applications/tdesudo/debian/preinst @@ -16,9 +16,16 @@ case "$1" in --rename /opt/trinity/bin/tdesu ;; upgrade) - dpkg-divert --package $package_name \ - --divert /opt/trinity/bin/tdesu.distrib \ - --rename /opt/trinity/bin/tdesu + divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"` + if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then + dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu" + fi + divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"` + if [ -z "$divert" ]; then + dpkg-divert --package $package_name \ + --divert /opt/trinity/bin/tdesu.distrib \ + --rename /opt/trinity/bin/tdesu + fi ;; abort-upgrade) ;; -- cgit v1.2.1