Merge lp:~axwalk/juju-core/lp1293198-agent-dir-path into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

agent: format agent dir correctly on Windows

The agent package was changed for upgrades,
and we regressed on Windows. The agent Dir
method must return *nix paths regardless of
what OS the code is built for.

Fixes lp:1293198

https://codereview.appspot.com/75190045/

agent: format agent dir correctly on Windows

The agent package was changed for upgrades,
and we regressed on Windows. The agent Dir
method must return *nix paths regardless of
what OS the code is built for.

Fixes lp:1293198

https://codereview.appspot.com/75190045/

[Andrew Wilkins (axwalk)]

Reviewers: mp+211850_code.launchpad.net,

Message:
Please take a look.

Description:
agent: format agent dir correctly on Windows

The agent package was changed for upgrades,
and we regressed on Windows. The agent Dir
method must return *nix paths regardless of
what OS the code is built for.

Fixes lp:1293198

https://code.launchpad.net/~axwalk/juju-core/lp1293198-agent-dir-path/+merge/211850

(do not edit description out of merge proposal)

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

Affected files (+5, -1 lines):
   A [revision details]
   M agent/agent.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-20140320011142-7ljymhlzvpq44apl
+New revision: <email address hidden>

Index: agent/agent.go
=== modified file 'agent/agent.go'
--- agent/agent.go 2014-03-19 11:45:36 +0000
+++ agent/agent.go 2014-03-20 02:14:29 +0000
@@ -327,7 +327,9 @@

  // Dir returns the agent-specific data directory.
  func Dir(dataDir, agentName string) string {
- return filepath.Join(dataDir, "agents", agentName)
+ // Note: must use path, not filepath, as this
+ // function is used by the client on Windows.
+ return path.Join(dataDir, "agents", agentName)
  }

  // ConfigPath returns the full path to the agent config file.

[Tim Penhey (thumper)]

On 2014/03/20 02:21:17, axw wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/75190045/

[Go Bot (go-bot)]

The attempt to merge lp:~axwalk/juju-core/lp1293198-agent-dir-path into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.013s
ok launchpad.net/juju-core/agent 1.080s
ok launchpad.net/juju-core/agent/mongo 0.537s
ok launchpad.net/juju-core/agent/tools 0.186s
ok launchpad.net/juju-core/bzr 5.696s
ok launchpad.net/juju-core/cert 2.216s
ok launchpad.net/juju-core/charm 0.424s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.030s
ok launchpad.net/juju-core/cloudinit/sshinit 0.945s
ok launchpad.net/juju-core/cmd 0.145s
ok launchpad.net/juju-core/cmd/charm-admin 0.726s
? 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 206.450s
ok launchpad.net/juju-core/cmd/jujud 65.598s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 8.691s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.165s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.020s
ok launchpad.net/juju-core/container 0.037s
ok launchpad.net/juju-core/container/factory 0.045s
ok launchpad.net/juju-core/container/kvm 0.195s
ok launchpad.net/juju-core/container/kvm/mock 0.049s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.317s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.206s
ok launchpad.net/juju-core/environs 2.318s
ok launchpad.net/juju-core/environs/bootstrap 10.933s
ok launchpad.net/juju-core/environs/cloudinit 0.460s
ok launchpad.net/juju-core/environs/config 2.133s
ok launchpad.net/juju-core/environs/configstore 0.032s
ok launchpad.net/juju-core/environs/filestorage 0.031s
ok launchpad.net/juju-core/environs/httpstorage 0.664s
ok launchpad.net/juju-core/environs/imagemetadata 0.453s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.047s
ok launchpad.net/juju-core/environs/jujutest 0.198s
ok launchpad.net/juju-core/environs/manual 11.043s
ok launchpad.net/juju-core/environs/simplestreams 0.309s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.905s
ok launchpad.net/juju-core/environs/storage 0.951s
ok launchpad.net/juju-core/environs/sync 44.696s
ok launchpad.net/juju-core/environs/testing 0.153s
ok launchpad.net/juju-core/environs/tools 4.991s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.012s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 17.640s
ok launchpad.net/juju-core/juju/arch 0.01...

=== modified file 'agent/agent.go'
--- agent/agent.go	2014-03-19 11:45:36 +0000
+++ agent/agent.go	2014-03-20 02:18:44 +0000
@@ -327,7 +327,9 @@
 
 // Dir returns the agent-specific data directory.
 func Dir(dataDir, agentName string) string {
-	return filepath.Join(dataDir, "agents", agentName)
+	// Note: must use path, not filepath, as this
+	// function is used by the client on Windows.
+	return path.Join(dataDir, "agents", agentName)
 }
 
 // ConfigPath returns the full path to the agent config file.