Juju Charms Collection
charmworld package

Merge lp:~adeuring/charms/precise/charmworld/fix-install-hook into lp:~juju-jitsu/charms/precise/charmworld/trunk

  1. Precise Pangolin (12.04)
  2. fix-install-hook
  3. Merge into trunk
Proposed by Abel Deuring
Status: Merged
Merged at revision: 56
Proposed branch: lp:~adeuring/charms/precise/charmworld/fix-install-hook
Merge into: lp:~juju-jitsu/charms/precise/charmworld/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
hooks/install (+1/-0)
To merge this branch: bzr merge lp:~adeuring/charms/precise/charmworld/fix-install-hook
Reviewer Review Type Date Requested Status
Juju-Jitsu Hackers Pending
Review via email: mp+152253@code.launchpad.net

Description of the change

fix an error in the install hook: The environment variable UPGRADING is not always defined when the hook is invoked, but the 'u' in "set -eu" at the top of the script lets it fail when a non-exiting variable is used.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2013-03-06 18:29:54 +0000
3+++ hooks/install 2013-03-07 18:37:22 +0000
4@@ -34,6 +34,7 @@
5 install -o charmworld -g charmworld -m 0755 -d $charmworld_home/var/charms
6 $INSTALL scripts/run-write-errors $webops_home
7 python scripts/gen_deploymgr.py
8+if [ ! -v UPGRADING ]; then UPGRADING=0 ; fi
9 if [ "$UPGRADING" != "1" ]; then
10 maybe_rmtree $project_dir
11 fi

Subscribers

People subscribed via source and target branches

to all changes: