Juju Charms

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

Proposed by Nick Barcet on 2011-12-08
Status: Merged
Approved by: Marco Ceppi on 2011-12-08
Approved revision: 16
Merged at revision: 12
Proposed branch: lp:~nijaba/charms/oneiric/limesurvey/trunk
Merge into: lp:charms/oneiric/limesurvey
Diff against target: 54 lines (+8/-2) 4 files modified
To merge this branch: bzr merge lp:~nijaba/charms/oneiric/limesurvey/trunk
Reviewer Review Type Date Requested Status
Marco Ceppi 2011-12-08 Approve on 2011-12-11
Review via email: mp+84927@code.launchpad.net

Description of the Change

fixed the logic on ch_get_file which seems to have changed

To post a comment you must log in.
Marco Ceppi (marcoceppi) :
review: Approve

Preview Diff

1=== modified file 'hooks/config-changed'
2--- hooks/config-changed 2011-12-06 22:03:26 +0000
3+++ hooks/config-changed 2011-12-08 11:42:26 +0000
4@@ -6,7 +6,9 @@
5 if [[ -e $FORMULA_DIR/limesurvey-common ]] ; then
6 . $FORMULA_DIR/limesurvey-common
7 else
8+ juju-log "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
9 echo "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
10+ exit 1
11 fi
12
13 # Write the limesurvey config
14
15=== modified file 'hooks/db-relation-changed'
16--- hooks/db-relation-changed 2011-12-06 23:59:47 +0000
17+++ hooks/db-relation-changed 2011-12-08 11:42:26 +0000
18@@ -6,7 +6,9 @@
19 if [[ -e $FORMULA_DIR/limesurvey-common ]] ; then
20 . $FORMULA_DIR/limesurvey-common
21 else
22+ juju-log "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
23 echo "ERROR: Could not load limesurvey-common from $FORMULA_DIR"
24+ exit 1
25 fi
26
27 juju-log "Creating appropriate upload paths and directories"
28
29=== modified file 'hooks/install'
30--- hooks/install 2011-12-04 23:41:40 +0000
31+++ hooks/install 2011-12-08 11:42:26 +0000
32@@ -12,8 +12,9 @@
33 . /usr/share/charm-helper/sh/net.sh
34 LURL="http://sourceforge.net/projects/limesurvey/files/1._LimeSurvey_stable/1.91%2B/limesurvey191plus-build11379-20111116.tar.bz2/download"
35 LHASH="230643aeec368d51a37dd6ad580ba0d3b72f9ef3"
36-ch_get_file $LURL $LHASH
37-tar -xjf /tmp/download --directory $where
38+download=`ch_get_file $LURL $LHASH`
39+echo "downloaded $download"
40+tar -xjf $download --directory $where
41
42 # Downloading Latest is not possible because of lack of control sha or md5 access
43 # use of 7 zip is therefore not required any more (see lp bug#899849)
44
45=== modified file 'hooks/limesurvey-common'
46--- hooks/limesurvey-common 2011-12-06 22:03:26 +0000
47+++ hooks/limesurvey-common 2011-12-08 11:42:26 +0000
48@@ -51,6 +51,7 @@
49 function set-config {
50 if [[ ! -e $config_tmp ]] ; then
51 juju-log "Database relation has not been established yet, can't write the config"
52+ echo "Database relation has not been established yet, can't write the config"
53 exit 0
54 fi
55

Subscribers

People subscribed via source and target branches

to all changes: