From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 28 Sep 2011 14:46:28 +0000 (+0200)
Subject: Run upgrade before dist-upgrade.
X-Git-Tag: debian/6.0.0~19
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=193ec74d7968fd36d24a6254085379eee24e3b7d;p=carnet-upgrade.git

Run upgrade before dist-upgrade.
---

diff --git a/src/functions.sh b/src/functions.sh
index 26d4014..28d229a 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -146,6 +146,12 @@ apt_download() {
 }
 
 dist_upgrade () {
+  log "Running upgrade ..."
+  apt-get -y$s upgrade || {
+    dpkg --configure -a
+    apt-get -y$s upgrade
+  }
+
   log "Running dist-upgrade ..."
   apt-get -y$s dist-upgrade || {
     dpkg --configure -a