Merge lp://staging/~natefinch/juju-core/019-osx-fix into lp://staging/juju-core/1.16
Proposed by
Curtis Hovey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Curtis Hovey | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 1966 | ||||
| Proposed branch: | lp://staging/~natefinch/juju-core/019-osx-fix | ||||
| Merge into: | lp://staging/juju-core/1.16 | ||||
| Diff against target: |
9 lines (+1/-0) 1 file modified
juju/osenv/vars_nix.go (+1/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~natefinch/juju-core/019-osx-fix | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Fix OSX build
we had no definition of the Home function under juju/osenv for OSX, because all we had was a _linux file and a _windows file. What we really needed was one implementation for Windows and one implementation for everything else. Now that's what we have. For the "everything else" we use the in-file build tag to specify that we don't build this file for Windows.
Description of the change
Fix OSX build
we had no definition of the Home function under juju/osenv for OSX, because all we had was a _linux file and a _windows file. What we really needed was one implementation for Windows and one implementation for everything else. Now that's what we have. For the "everything else" we use the in-file build tag to specify that we don't build this file for Windows.
To post a comment you must log in.
Revision history for this message
| Dave Cheney (dave-cheney) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
THis has LGTM per the reviews for the trunk merge: https:/