Changeset 2966 for trunk

Timestamp:

Jan 28, 2010, 12:24:00 AM (15 years ago)

Author:

broder

Message:

Fix invirt-base's handling of triggers.

Location:

trunk/packages/invirt-base

Files:

• debian/changelog (modified) (1 diff)
• debian/invirt-base.postinst (modified) (1 diff)
• scripts/invirt-reload (modified) (1 diff)

trunk/packages/invirt-base/debian/changelog

@@ +1 @@
+invirt-base (0.0.30) unstable; urgency=low
+
+  * Cleanup the handling of triggers...so that it actually works.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 28 Jan 2010 00:22:21 -0500
+
 invirt-base (0.0.29) unstable; urgency=low
 

trunk/packages/invirt-base/debian/invirt-base.postinst

@@ -27 +27 @@
 
     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
     ;;
 

trunk/packages/invirt-base/scripts/invirt-reload

@@ -1 +1 @@
 #!/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