diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-02-15 16:59:06 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-02-15 16:59:06 +0100 |
| commit | 683152f3b286a04a76f31ee1eed839bbdb2ab307 (patch) | |
| tree | fc382ee1f535909a1892d0e07ebeb957fa68c49f /ubuntu/maverick/applications/tdesudo | |
| parent | cbfc487458706037e61278c9b5263685619d47f0 (diff) | |
| download | tde-packaging-683152f3b286a04a76f31ee1eed839bbdb2ab307.tar.gz tde-packaging-683152f3b286a04a76f31ee1eed839bbdb2ab307.zip | |
Fix handling of diverts on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick/applications/tdesudo')
| -rw-r--r-- | ubuntu/maverick/applications/tdesudo/debian/postinst | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/tdesudo/debian/preinst | 13 |
2 files changed, 10 insertions, 5 deletions
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) ;; |