X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=4775de37b654f9809dae7c851260267197a94750;hb=bd8d48933bb57b293c40f22745277ec6027bd083;hp=1d83c80be1a0348098072d24ce40d3438d432e43;hpb=ef77c3319e1d5234b7e0a4974c8401bbf8039ec9;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 1d83c80..4775de3 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -231,8 +231,13 @@ run_actions() {
     [ "$check" != "true" ] && checkmsg="if '$check'"
     if eval $check; then
       log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
-      eval $action
-      log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
+      if ! eval $action; then
+        log "$(printf 'action %02d' $lineno) failed: '${action}' $checkmsg "
+        display_action_failure "$action"
+        exit 1
+      else  
+        log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
+      fi
     else
       log "$(printf 'action %02d' $lineno) skipping: '${action}' $checkmsg"
     fi
@@ -242,6 +247,24 @@ run_actions() {
   log "-----"
 }
 
+# report action failure
+display_action_failure () {
+  local action=$1
+
+  notice "
+Doslo je do greske prilikom izvrsavanja akcije '$action'. Detalje problema moguce je vidjeti u log datotekama:
+
+  /var/log/carnet-upgrade.log
+  /var/log/carnet-upgrade.typescript
+
+Da bi dovrsili zapocete operacije nad paketima pokrenite:
+
+  # dpkg --configure -a
+  # apt-get -f install
+
+Nakon toga ponovno pozovite carnet-upgrade skriptu."
+}
+
 # funkcija vraca popis paketa koje treba upgradeati
 what_upgrade () {
   local IFSOLD name version package
@@ -611,10 +634,6 @@ upgrade_libc () {
 upgrade_apache2 () {
   local package packages
 
-  # php-suhosin-cn causes removal of applications on dist-upgrade
-  # because of php5 only dependencies
-  pkgrm php-suhosin-cn
-
   for package in \
       libapache2-mod-php4 \
       php4-cli \
@@ -622,16 +641,20 @@ upgrade_apache2 () {
       php4-cn \
       apache2-cn \
       php4-odbc \
-      php4-suhosin
+      php4-suhosin \
+      php-suhosin-cn
   do
       if pkg $package; then
           packages="$packages $package"
       fi
   done
 
-  for package in $(echo $packages); do
-      pkgadd $package
-  done
+  # enable suhosin downgrade to etch version
+  if pkg php4-suhosin; then
+      pkgrm php4-suhosin php-suhosin-cn
+  fi
+
+  eval pkgadd $packages
 }
 
 upgrade_amavis () {
@@ -644,10 +667,11 @@ upgrade_amavis () {
   fi
 
   # move old config aside
-  conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.$backup_ext ]; then
-    mv -v $conf $conf.$backup_ext
-  fi
+  for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
+    if [ -e $conf -a ! -e $conf.$backup_ext ]; then
+      mv -v $conf $conf.$backup_ext
+    fi
+  done
 
   # install new packages
   pkgadd amavisd-cn amavisd-new