juju-core

Merge lp://staging/~natefinch/juju-core/019-osx-fix into lp://staging/~go-bot/juju-core/trunk

  1. 019-osx-fix
  2. Merge into trunk
Proposed by Nate Finch
Status: Merged
Approved by: Nate Finch
Approved revision: no longer in the source branch.
Merged at revision: 1955
Proposed branch: lp://staging/~natefinch/juju-core/019-osx-fix
Merge into: lp://staging/~go-bot/juju-core/trunk
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
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+189640@code.staging.launchpad.net

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.

https://codereview.appspot.com/14496043/

To post a comment you must log in.
Revision history for this message
Nate Finch (natefinch) wrote :

Reviewers: mp+189640_code.launchpad.net,

Message:
Please take a look.

Description:
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.

https://code.launchpad.net/~natefinch/juju-core/019-osx-fix/+merge/189640

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/14496043/

Affected files (+3, -0 lines):
   A [revision details]
   M juju/osenv/vars_notwin.go

Index: [revision details]
=== 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-20131004160159-i9eoormyw24etfr4
+New revision: <email address hidden>

Index: juju/osenv/vars_notwin.go
=== renamed file 'juju/osenv/vars_linux.go' => 'juju/osenv/vars_notwin.go'
--- juju/osenv/vars_linux.go 2013-08-28 20:37:53 +0000
+++ juju/osenv/vars_notwin.go 2013-10-07 15:31:14 +0000
@@ -1,5 +1,6 @@
  // Copyright 2013 Canonical Ltd.
  // Licensed under the AGPLv3, see LICENCE file for details.
+// +build !windows

  package osenv

Revision history for this message
Martin Packman (gz) wrote :

LGTM, though I prefer 'nix' to notwin as the non-magic name.

https://codereview.appspot.com/14496043/

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (16.2 KiB)

The attempt to merge lp:~natefinch/juju-core/019-osx-fix into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.324s
ok launchpad.net/juju-core/agent/tools 0.245s
ok launchpad.net/juju-core/bzr 6.834s
ok launchpad.net/juju-core/cert 3.919s
ok launchpad.net/juju-core/charm 0.567s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.027s
ok launchpad.net/juju-core/cmd 0.240s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 180.421s
ok launchpad.net/juju-core/cmd/jujud 47.844s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 1.814s
ok launchpad.net/juju-core/constraints 0.026s
ok launchpad.net/juju-core/container/lxc 0.313s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.289s
ok launchpad.net/juju-core/environs 3.155s
ok launchpad.net/juju-core/environs/bootstrap 4.983s
ok launchpad.net/juju-core/environs/cloudinit 0.497s
ok launchpad.net/juju-core/environs/config 0.704s
ok launchpad.net/juju-core/environs/configstore 0.041s
ok launchpad.net/juju-core/environs/filestorage 0.031s
ok launchpad.net/juju-core/environs/httpstorage 0.841s
ok launchpad.net/juju-core/environs/imagemetadata 0.458s
ok launchpad.net/juju-core/environs/instances 0.052s
ok launchpad.net/juju-core/environs/jujutest 0.250s
ok launchpad.net/juju-core/environs/manual 4.176s
ok launchpad.net/juju-core/environs/simplestreams 0.390s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.094s
ok launchpad.net/juju-core/environs/storage 1.158s
ok launchpad.net/juju-core/environs/sync 28.724s
ok launchpad.net/juju-core/environs/testing 0.247s
ok launchpad.net/juju-core/environs/tools 6.971s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.015s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 17.243s
ok launchpad.net/juju-core/juju/osenv 0.018s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.015s
ok launchpad.net/juju-core/log/syslog 0.024s
ok launchpad.net/juju-core/names 0.024s
? launchpad.net/juju-core/provider [no test files]
? launchpad.net/juju-core/provider/all [no test files]
ok launchpad.net/juju-core/provider/azure 6.303s
ok launchpad.net/juju-core/provider/common 0.306s
ok launchpad.net/juju-core/provider/dummy 21.345s
ok launchpad.net/juju-core/provider/ec2 5.356s
ok launchpad.net/juju-core/provider/ec2/httpstorage 0.211s
ok launchpad.net/juju-core/provider/local 2.298s
ok launchpad.net/juju-core/provider/maas 3.692s
ok launchpad.net/juju-core/provider/null 1.234s
ok launchpad.net/juju-core/provider/openstack 13.432s
ok launchpad.net/juju-core/rpc 0.074s
ok launchpad.net/juju-core/rpc/jsoncodec 0.029s
? launchpad.net/juju-core/rpc/rpcreflect [no test files]
ok launchp...

Revision history for this message
William Reade (fwereade) wrote :

I have a report from dstroppa, who's doing the joyent provider, that
it's still not building on OS X for him. Do you have a mac handy to
check this against?

https://codereview.appspot.com/14496043/

Revision history for this message
Nate Finch (natefinch) wrote :

I don't, but it builds for darwin with Dave's cross compile script, so it
should build.... I haven't actually merged the change from trunk into 1.15
yet, so that's probably the problem if he's building there.

On Mon, Oct 7, 2013 at 6:27 PM, William Reade
<email address hidden>wrote:

> I have a report from dstroppa, who's doing the joyent provider, that
> it's still not building on OS X for him. Do you have a mac handy to
> check this against?
>
> https://codereview.appspot.com/14496043/
>
> --
> https://code.launchpad.net/~natefinch/juju-core/019-osx-fix/+merge/189640
> You are the owner of lp:~natefinch/juju-core/019-osx-fix.
>

Revision history for this message
Dave Cheney (dave-cheney) wrote :

LGTM. _posix.go or _unix.go are more traditional suffixes.

On Tue, Oct 8, 2013 at 9:36 AM, Nate Finch <email address hidden> wrote:
> I don't, but it builds for darwin with Dave's cross compile script, so it
> should build.... I haven't actually merged the change from trunk into 1.15
> yet, so that's probably the problem if he's building there.
>
>
> On Mon, Oct 7, 2013 at 6:27 PM, William Reade
> <email address hidden>wrote:
>
>> I have a report from dstroppa, who's doing the joyent provider, that
>> it's still not building on OS X for him. Do you have a mac handy to
>> check this against?
>>
>> https://codereview.appspot.com/14496043/
>>
>> --
>> https://code.launchpad.net/~natefinch/juju-core/019-osx-fix/+merge/189640
>> You are the owner of lp:~natefinch/juju-core/019-osx-fix.
>>
>
> --
> https://code.launchpad.net/~natefinch/juju-core/019-osx-fix/+merge/189640
> You are subscribed to branch lp:juju-core.

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 status/vote changes: