From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 26 Aug 2009 11:23:17 +0000 (+0200)
Subject: Hold carnet-upgrade until the upgrade finishes.
X-Git-Tag: debian/5.0.3~5
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=commitdiff_plain;h=62570336ff4a368ae1b9de58f08d94a0da99f14c

Hold carnet-upgrade until the upgrade finishes.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 572eb9a..98574fb 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,6 +1,7 @@
 # Full upgrade
 true				first_warning
 true				check_my_version
+true				hold_carnet_upgrade
 true				check_php_version
 true				check_upgrade
 true				check_grsec_kernel
@@ -59,5 +60,6 @@ true				run_post_upgrade
 true				apt_listchanges enable
 true				debconf_priority reset
 true				fix_issue
+true				release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true				check_services postupgrade
diff --git a/src/functions.sh b/src/functions.sh
index 09b5479..5ec3d81 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1376,3 +1376,12 @@ round() {
 
   echo $num
 }
+
+# make sure carnet-upgrade doesn't get upgraded until the end
+hold_carnet_upgrade() {
+  echo carnet-upgrade hold | dpkg --set-selections
+}
+
+release_carnet_upgrade() {
+  echo carnet-upgrade install | dpkg --set-selections
+}