From: Evan Broder Date: Thu, 28 Jan 2010 05:24:00 +0000 (-0500) Subject: Fix invirt-base's handling of triggers. X-Git-Tag: 0.0.30^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-base.git/commitdiff_plain/6b79bea089ab5a08923787ea9fae861891a737fc Fix invirt-base's handling of triggers. svn path=/trunk/packages/invirt-base/; revision=2966 --- diff --git a/debian/changelog b/debian/changelog index 3d3f987..ff1b3fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-base (0.0.30) unstable; urgency=low + + * Cleanup the handling of triggers...so that it actually works. + + -- Evan Broder Thu, 28 Jan 2010 00:22:21 -0500 + invirt-base (0.0.29) unstable; urgency=low [ Greg Brockman ] diff --git a/debian/invirt-base.postinst b/debian/invirt-base.postinst index 73ea19b..2ca852d 100755 --- a/debian/invirt-base.postinst +++ b/debian/invirt-base.postinst @@ -26,11 +26,7 @@ case "$1" in ;; triggered) - if dpkg --compare-versions "$DPKG_RUNNING_VERSION" ge '1.14.5ubuntu10~~'; then - invirt-reload - else - DPKG_MAINTSCRIPT_PACKAGE='' invirt-reload - fi + INVIRT_RELOAD_NOTRIGGER=y invirt-reload ;; *) diff --git a/scripts/invirt-reload b/scripts/invirt-reload index 84dbe7a..7792f50 100755 --- a/scripts/invirt-reload +++ b/scripts/invirt-reload @@ -1,9 +1,10 @@ #!/bin/bash -if [ "$DPKG_MAINTSCRIPT_PACKAGE" != '' ] && \ +if [ x"$INVIRT_RELOAD_NOTRIGGER" = x ] && \ + [ "$DPKG_MAINTSCRIPT_PACKAGE" != '' ] && \ [ $# = 0 ] && \ dpkg-trigger --check-supported 2>/dev/null; then - if dpkg-trigger --no-await invirt-base; then + if dpkg-trigger --no-await invirt-reload; then echo "invirt-reload: deferring update (trigger activated)" exit 0 fi