diff mbox

[4/7] always check the version before calling dpkg-divert, except on install

Message ID 1299266681-13266-4-git-send-email-steve.langasek@linaro.org
State New
Headers show

Commit Message

Steve Langasek March 4, 2011, 7:24 p.m. UTC
From: Steve Langasek <steve.langasek@canonical.com>

We always want to check the version number of the previous package before
calling dpkg-divert, *except* on install, because one of the other options
besides install and upgrade is 'abort-upgrade' - an aborted upgrade shouldn't
result in us trying to readd the diversion.
---
 debian/libturbojpeg62.preinst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/debian/libturbojpeg62.preinst b/debian/libturbojpeg62.preinst
index d0a4a54..03ff534 100644
--- a/debian/libturbojpeg62.preinst
+++ b/debian/libturbojpeg62.preinst
@@ -2,7 +2,7 @@ 
 
 set -e
 
-if [ upgrade != "$1" ] || dpkg --compare-versions "$2" lt 6b-git.20101110t043445.8a20111-0linaro2; then
+if [ install = "$1" ] || dpkg --compare-versions "$2" lt 6b-git.20101110t043445.8a20111-0linaro2; then
 	dpkg-divert --package libjpeg-turbo --add -rename --divert \
 		/usr/lib/libjpeg.so.62.0.0.orig /usr/lib/libjpeg.so.62.0.0 
 fi