Merge lp:~nijaba/charms/oneiric/limesurvey/trunk into lp:charms/oneiric/limesurvey

[Nick Barcet]

fixed the logic on ch_get_file which seems to have changed

[Marco Ceppi (marcoceppi)]

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2011-12-06 22:03:26 +0000
+++ hooks/config-changed	2011-12-08 11:42:26 +0000
@@ -6,7 +6,9 @@
 if [[ -e $FORMULA_DIR/limesurvey-common ]] ; then
     . $FORMULA_DIR/limesurvey-common
 else
+    juju-log "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
     echo "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
+    exit 1
 fi
 
 # Write the limesurvey config
 
=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2011-12-06 23:59:47 +0000
+++ hooks/db-relation-changed	2011-12-08 11:42:26 +0000
@@ -6,7 +6,9 @@
 if [[ -e $FORMULA_DIR/limesurvey-common ]] ; then
     . $FORMULA_DIR/limesurvey-common
 else
+    juju-log "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
     echo "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
+    exit 1
 fi
 
 juju-log "Creating appropriate upload paths and directories"
 
=== modified file 'hooks/install'
--- hooks/install	2011-12-04 23:41:40 +0000
+++ hooks/install	2011-12-08 11:42:26 +0000
@@ -12,8 +12,9 @@
 . /usr/share/charm-helper/sh/net.sh
 LURL="http://sourceforge.net/projects/limesurvey/files/1._LimeSurvey_stable/1.91%2B/limesurvey191plus-build11379-20111116.tar.bz2/download"
 LHASH="230643aeec368d51a37dd6ad580ba0d3b72f9ef3"
-ch_get_file $LURL $LHASH
-tar -xjf /tmp/download --directory $where
+download=`ch_get_file $LURL $LHASH`
+echo "downloaded $download"
+tar -xjf $download --directory $where
 
 # Downloading Latest is not possible because of lack of control sha or md5 access
 # use of 7 zip is therefore not required any more (see lp bug#899849)
 
=== modified file 'hooks/limesurvey-common'
--- hooks/limesurvey-common	2011-12-06 22:03:26 +0000
+++ hooks/limesurvey-common	2011-12-08 11:42:26 +0000
@@ -51,6 +51,7 @@
 function set-config {
   if [[ ! -e $config_tmp ]] ; then
     juju-log "Database relation has not been established yet, can't write the config"
+    echo "Database relation has not been established yet, can't write the config"
     exit 0
   fi