Merge lp://staging/~sinzui/charms/precise/charmworld/project-dir-var into lp://staging/~juju-jitsu/charms/precise/charmworld/trunk

Proposed by Curtis Hovey
Status: Merged
Approved by: Curtis Hovey
Approved revision: 68
Merged at revision: 67
Proposed branch: lp://staging/~sinzui/charms/precise/charmworld/project-dir-var
Merge into: lp://staging/~juju-jitsu/charms/precise/charmworld/trunk
Diff against target: 19 lines (+2/-2)
2 files modified
hooks/config-changed (+1/-1)
revision (+1/-1)
To merge this branch: bzr merge lp://staging/~sinzui/charms/precise/charmworld/project-dir-var
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+159186@code.staging.launchpad.net

Commit message

Fix $project_dir variable in hooks/config-changed

Description of the change

I get an error because update_source() uses $projectdir, but this variable was never defined. The rest of the script uses $project_dir.

2013-04-16 15:19:15,232: hook.output@INFO: Finished processing dependencies for charmworld==0.0

2013-04-16 15:19:15,239: hook.output@INFO: /var/lib/juju/units/app-charmworld-0/charm/hooks/config-changed: line 53: projectdir: unbound variable

2013-04-16 15:19:15,240: hook.output@DEBUG: hook config-changed exited, exit code Traceback (most recent call last):
Failure: juju.errors.CharmInvocationError: Error processing '/var/lib/juju/units/app-charmworld-0/charm/hooks/config-changed': exit code 1.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Self approving since the fix is obvious and I am testing this fix for webops right now.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: