r1198 - in /unstable/evolution/debian: changelog evolution.preinst

[joss at users.alioth.debian.org]

Author: joss
Date: Sat May  2 07:32:45 2009
New Revision: 1198

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1198
Log:
evolution.preinst: use pgrep to match evolution processes instead of 
being so strict. Closes: #525985.

Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/evolution.preinst

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1198&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Sat May  2 07:32:45 2009
@@ -1,3 +1,10 @@
+evolution (2.26.1.1-2) UNRELEASED; urgency=low
+
+  * evolution.preinst: use pgrep to match evolution processes instead of 
+    being so strict. Closes: #525985.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 02 May 2009 09:31:52 +0200
+
 evolution (2.26.1.1-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: unstable/evolution/debian/evolution.preinst
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.preinst?rev=1198&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.preinst (original)
+++ unstable/evolution/debian/evolution.preinst Sat May  2 07:32:45 2009
@@ -12,7 +12,7 @@
 
 upgrade_check() {
   seen=0
-  while ps ax | egrep -q 'evolution( .*)?$'; do
+  while pgrep '^(/usr/lib/)?evolution' > /dev/null; do
     error_msg
     seen=$(($seen + 1))
     if [ $seen = 3 ]; then