From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Fri, 18 Oct 2013 06:50:55 +0000 (+0200)
Subject: Handle mailman upgrade.
X-Git-Tag: debian/7.0.1~3
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=33647acc9accaf03069681d6d8a4524aca1bd85d;p=carnet-upgrade.git

Handle mailman upgrade.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 127674e..bca50ee 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -38,6 +38,7 @@ pkg postfix-cn			upgrade_postfix
 pkg dovecot-cn			upgrade_dovecot
 pkg bind9-cn			upgrade_bind
 pkg fail2ban-cn			upgrade_fail2ban
+pkg mailman-cn			upgrade_mailman
 true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
diff --git a/src/functions.sh b/src/functions.sh
index 0ff3ca7..051b34c 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -998,6 +998,14 @@ upgrade_fail2ban() {
   fi
 }
 
+# manual upgrade of mailman to avoid two copies of mailman running
+# first started by python upgrade and second started by mailman itself
+upgrade_mailman() {
+  /etc/init.d/mailman stop || true
+  pkgadd python
+  pkgadd mailman mailman-cn
+}
+
 get_variable () {
   local name=$1 file=$2 val