[Pkg-libvirt-commits] [libvirt] 01/02: Also stop libvirt-bin in libvirt-bin's preinst

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.7-7
in repository libvirt.

commit 63e7e51b92421f5b2a705e0f4db4e55cd4ace402
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Aug 13 08:53:04 2014 +0200

    Also stop libvirt-bin in libvirt-bin's preinst
    
    When libvirt-daemon-system's preinst runs the new libvirt-bin might
    already be unpacked and therefore the libvirt-bin service file already
    gone. So additionally stop libvirt-bin in libvirt-bin's preinst.
    
    Closes: #757952
---
 debian/{libvirt-daemon-system.preinst => libvirt-bin.preinst} | 7 ++-----
 debian/libvirt-daemon-system.preinst                          | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/libvirt-daemon-system.preinst b/debian/libvirt-bin.preinst
similarity index 78%
copy from debian/libvirt-daemon-system.preinst
copy to debian/libvirt-bin.preinst
index e4726da..d8dff6f 100644
--- a/debian/libvirt-daemon-system.preinst
+++ b/debian/libvirt-bin.preinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for libvirt-daemon-system
+# preinst script for libvirt-bin
 #
 # see: dh_installdeb(1)
 
@@ -19,13 +19,10 @@ case "$1" in
 	# When renaming the .service file, systemd might become confused, we
 	# need to ensure that the libvirtd daemon is fully stopped before
 	# trying to restart it again. (Bug: #730604)
-	if dpkg --compare-versions "$2" lt "1.2.7-5~"; then
+	if dpkg --compare-versions "$2" lt-ne "1.2.6-1~"; then
 	    if [ -d /run/systemd/system ]; then
 	        [ ! -f /lib/systemd/system/libvirt-bin.service ] || invoke-rc.d libvirt-bin stop
 	    fi
-	    # Remove everything we know about libvirt-bin.service
-	    deb-systemd-helper purge libvirt-bin.service >/dev/null
-	    deb-systemd-helper unmask libvirt-bin.service >/dev/null
 	fi
     ;;
 
diff --git a/debian/libvirt-daemon-system.preinst b/debian/libvirt-daemon-system.preinst
index e4726da..8a06ff5 100644
--- a/debian/libvirt-daemon-system.preinst
+++ b/debian/libvirt-daemon-system.preinst
@@ -19,7 +19,7 @@ case "$1" in
 	# When renaming the .service file, systemd might become confused, we
 	# need to ensure that the libvirtd daemon is fully stopped before
 	# trying to restart it again. (Bug: #730604)
-	if dpkg --compare-versions "$2" lt "1.2.7-5~"; then
+	if dpkg --compare-versions "$2" lt "1.2.6-1~"; then
 	    if [ -d /run/systemd/system ]; then
 	        [ ! -f /lib/systemd/system/libvirt-bin.service ] || invoke-rc.d libvirt-bin stop
 	    fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git