r1768 - in /unstable/evolution/debian: evolution.preinst evolution.templates

[corsac at users.alioth.debian.org]

Author: corsac
Date: Thu Oct 14 19:31:04 2010
New Revision: 1768

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1768
Log:
tune debconf template and script

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

Modified: unstable/evolution/debian/evolution.preinst
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.preinst?rev=1768&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.preinst (original)
+++ unstable/evolution/debian/evolution.preinst Thu Oct 14 19:31:04 2010
@@ -2,7 +2,7 @@
 set -e
 
 . /usr/share/debconf/confmodule
-EVO_PROCESS="'evolution|/usr/lib/evolution/.*/evolution-exchange-storage|/usr/lib/evolution/evolution-data-server-.*'"
+EVO_PROCESS='evolution|/usr/lib/evolution/.*/evolution-exchange-storage|/usr/lib/evolution/evolution-data-server-.*'
 
 error_msg() {
   db_title Upgrading evolution
@@ -14,13 +14,18 @@
 end_msg() {
   db_title Evolution processes still present
   db_input high evolution/kill_processes || true
+  db_fset evolution/kill_processes seen false
+  db_go
 }
 
 upgrade_check() {
   seen=0
   while pgrep -fx ${EVO_PROCESS} > /dev/null; do
-    error_msg
     seen=$(($seen + 1))
+    if [ $seen -lt 4 ];
+    then
+        error_msg
+    fi
     if [ $seen = 3 ]; then
       end_msg
       db_get evolution/kill_processes
@@ -32,7 +37,6 @@
       else
         # proceed with the upgrade, try to kill any remaining evolution process
         # before
-        db_stop
         echo "Evolution is still running but proceeding with the upgrade..." 
         pkill -fx ${EVO_PROCESS} > /dev/null
       fi
@@ -40,6 +44,7 @@
     if [ $seen = 4 ]; then
       # means we choose to proceed and tried to kill evo process but failed for
       # some reason. Try harder, then continue anyway
+      db_stop
       pkill -9 -fx ${EVO_PROCESS} > /dev/null
       return
     fi

Modified: unstable/evolution/debian/evolution.templates
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution.templates?rev=1768&op=diff
==============================================================================
--- unstable/evolution/debian/evolution.templates (original)
+++ unstable/evolution/debian/evolution.templates Thu Oct 14 19:31:04 2010
@@ -1,6 +1,6 @@
 Template: evolution/needs_shutdown
 Type: error
-_Description: Running instances of Evolution detected
+Description: Running instances of Evolution detected
  You are currently upgrading Evolution to a version with an incompatible
  index format. However, it has been detected that Evolution is
  currently running. Upgrading it before shutting it down could lead to
@@ -13,9 +13,9 @@
  environments before upgrading.
 
 Template: evolution/kill_processes
-Type: choices
+Type: select
 Choices: Abort, Kill processes and proceed
-_Description: Evolution processes still present on the system.
+Description: Evolution processes still present on the system.
  Evolution processes are still present on this system, preventing a safe
  upgrade. 
  .