Merge lp:~james-page/charms/precise/keystone/juju-core-unison into lp:~charmers/charms/precise/keystone/trunk

Proposed by James Page on 2013-10-03
Status: Merged
Approved by: Adam Gandelman on 2013-10-03
Approved revision: 46
Merged at revision: 46
Proposed branch: lp:~james-page/charms/precise/keystone/juju-core-unison
Merge into: lp:~charmers/charms/precise/keystone/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/lib/unison.py (+1/-1)
To merge this branch: bzr merge lp:~james-page/charms/precise/keystone/juju-core-unison
Reviewer Review Type Date Requested Status
Ante Karamatić (community) Approve on 2013-10-03
charmers 2013-10-03 Pending
Review via email: mp+189053@code.launchpad.net

Description of the change

juju-core sets restricted permissions on the charm directory; running as a
different user fails for unison.

This just switched to / before running the unison command.

Verified as fixing sync issues by Ante (ivoks).

To post a comment you must log in.
Ante Karamatić (ivoks) wrote :

Looks good to me :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/lib/unison.py'
2--- hooks/lib/unison.py 2013-04-09 12:16:44 +0000
3+++ hooks/lib/unison.py 2013-10-03 11:46:30 +0000
4@@ -173,7 +173,7 @@
5
6
7 def run_as_user(user, cmd):
8- return subprocess.check_output(cmd, preexec_fn=_run_as_user(user))
9+ return subprocess.check_output(cmd, preexec_fn=_run_as_user(user), cwd='/')
10
11
12 def sync_to_peers(peer_interface, user, paths=[], verbose=False):

Subscribers

People subscribed via source and target branches

to all changes: