Merge lp://staging/~axwalk/juju-core/lp1296739-local-sudo-env into lp://staging/~go-bot/juju-core/trunk
Proposed by
Andrew Wilkins
Status: | Merged |
---|---|
Approved by: | Andrew Wilkins |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2471 |
Proposed branch: | lp://staging/~axwalk/juju-core/lp1296739-local-sudo-env |
Merge into: | lp://staging/~go-bot/juju-core/trunk |
Diff against target: |
24 lines (+2/-1) 2 files modified
provider/local/environ.go (+1/-1) provider/local/environ_test.go (+1/-0) |
To merge this branch: | bzr merge lp://staging/~axwalk/juju-core/lp1296739-local-sudo-env |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+212538@code.staging.launchpad.net |
Commit message
provider/local: use "env" to propagate JUJU_HOME
Sudo may not allow environment variables to be
set directly, so we must use "env" to set JUJU_HOME
when re-executing juju as root.
Fixes lp:1296739
Description of the change
provider/local: use "env" to propagate JUJU_HOME
Sudo may not allow environment variables to be
set directly, so we must use "env" to set JUJU_HOME
when re-executing juju as root.
Fixes lp:1296739
To post a comment you must log in.
Reviewers: mp+212538_ code.launchpad. net,
Message:
Please take a look.
Description:
provider/local: use "env" to propagate JUJU_HOME
Sudo may not allow environment variables to be
set directly, so we must use "env" to set JUJU_HOME
when re-executing juju as root.
Fixes lp:1296739
https:/ /code.launchpad .net/~axwalk/ juju-core/ lp1296739- local-sudo- env/+merge/ 212538
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/79620043/
Affected files (+4, -1 lines): local/environ. go local/environ_ test.go
A [revision details]
M provider/
M provider/
Index: [revision details] 20140324200845- j6jqyuz0uwfvu29 o
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: provider/ local/environ. go local/environ. go' local/environ. go 2014-03-24 04:05:24 +0000 local/environ. go 2014-03-25 02:46:17 +0000 nvKey + "=" + osenv.JujuHome(), nvKey + "=" + osenv.JujuHome(), environment" , "-y", "--force", env.Name(), "sudo", args...)
=== modified file 'provider/
--- provider/
+++ provider/
@@ -406,7 +406,7 @@
return err
}
args := []string{
- osenv.JujuHomeE
+ "env", osenv.JujuHomeE
juju, "destroy-
}
cmd := exec.Command(
Index: provider/ local/environ_ test.go local/environ_ test.go' local/environ_ test.go 2014-03-24 04:05:24 +0000 local/environ_ test.go 2014-03-25 02:46:17 +0000 environment" ,
=== modified file 'provider/
--- provider/
+++ provider/
@@ -206,6 +206,7 @@
c.Assert(err, gc.IsNil)
expected := []string{
s.fakesudo,
+ "env",
"JUJU_HOME=" + osenv.JujuHome(),
os.Args[0],
"destroy-