From 2b32209b6a026b513ed2f08a688498aabcce119f Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Fri, 18 Dec 2009 04:55:27 -0800 Subject: [PATCH] Revert "Don't use killall to kill off browser-switchboards in postrm" This reverts commit 414af7e1dcefb4a5eb39f185c24d24c9115757d3. This had the nasty effect of killing dpkg on an upgrade. Will fix differently. --- debian/postrm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/postrm b/debian/postrm index e2c989c..86d2b28 100644 --- a/debian/postrm +++ b/debian/postrm @@ -19,12 +19,14 @@ set -e # the debian-policy package kill_old_proxies() { - # Kill off browser-switchboards + # Kill off old python browser-switchboards, if any # This would be so much nicer with pgrep/pkill ... - proxy_pids=`busybox ps | fgrep browser-switchboard | fgrep -v grep | fgrep -v browser-switchboard.postrm | awk '{ print $1 }'` + proxy_pids=`busybox ps | fgrep "python /usr/bin/browser-switchboard" | fgrep -v grep | awk '{ print $1 }'` if [ ! -z "$proxy_pids" ]; then kill $proxy_pids fi + # Kill off C browser-switchboards + killall browser-switchboard } case "$1" in -- 1.7.9.5