Merge lp:~wallyworld/juju-core/1304742-backport-1.18 into lp:juju-core/1.18

[Ian Booth]

Cherry pick trunk r2600 to fix bug #1304742: version reports "armhf" on arm64

Cherry pick trunk r2600 to fix bug #1304742: version reports "armhf" on arm64

[Go Bot (go-bot)]

The attempt to merge lp:~wallyworld/juju-core/1304742-backport-1.18 into lp:juju-core/1.18 failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.089s
ok launchpad.net/juju-core/agent/mongo 0.628s
ok launchpad.net/juju-core/agent/tools 0.213s
ok launchpad.net/juju-core/bzr 5.005s
ok launchpad.net/juju-core/cert 2.192s
ok launchpad.net/juju-core/charm 0.410s
? 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.875s
ok launchpad.net/juju-core/cmd 0.203s
ok launchpad.net/juju-core/cmd/charm-admin 0.754s
? 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 205.745s
ok launchpad.net/juju-core/cmd/jujud 64.502s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 7.109s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.189s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.022s
ok launchpad.net/juju-core/container 0.056s
ok launchpad.net/juju-core/container/factory 0.050s
ok launchpad.net/juju-core/container/kvm 0.196s
ok launchpad.net/juju-core/container/kvm/mock 0.051s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.365s
? 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.213s
ok launchpad.net/juju-core/environs 2.335s
ok launchpad.net/juju-core/environs/bootstrap 10.364s
ok launchpad.net/juju-core/environs/cloudinit 0.477s
ok launchpad.net/juju-core/environs/config 1.543s
ok launchpad.net/juju-core/environs/configstore 0.036s
ok launchpad.net/juju-core/environs/filestorage 0.027s
ok launchpad.net/juju-core/environs/httpstorage 0.689s
ok launchpad.net/juju-core/environs/imagemetadata 0.413s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.051s
ok launchpad.net/juju-core/environs/jujutest 0.175s
ok launchpad.net/juju-core/environs/manual 14.722s
ok launchpad.net/juju-core/environs/simplestreams 0.282s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.137s
ok launchpad.net/juju-core/environs/storage 0.898s
ok launchpad.net/juju-core/environs/sync 44.170s
ok launchpad.net/juju-core/environs/testing 0.127s
ok launchpad.net/juju-core/environs/tools 5.019s
? 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.017s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 19.097s
ok launchpad.net/juju-core/juju/arc...

=== modified file 'juju/arch/arch.go'
--- juju/arch/arch.go	2014-04-03 20:36:17 +0000
+++ juju/arch/arch.go	2014-04-29 17:20:20 +0000
@@ -35,7 +35,7 @@
 }{
 	{regexp.MustCompile("amd64|x86_64"), AMD64},
 	{regexp.MustCompile("i?[3-9]86"), I386},
-	{regexp.MustCompile("arm|armv.*"), ARM},
+	{regexp.MustCompile("(arm$)|(armv.*)"), ARM},
 	{regexp.MustCompile("aarch64"), ARM64},
 	{regexp.MustCompile("ppc64el|ppc64le"), PPC64},
 }

=== modified file 'juju/arch/arch_test.go'
--- juju/arch/arch_test.go	2014-04-03 20:36:17 +0000
+++ juju/arch/arch_test.go	2014-04-29 17:20:20 +0000
@@ -37,6 +37,7 @@
 		{"armv", "armhf"},
 		{"armv7", "armhf"},
 		{"aarch64", "arm64"},
+		{"arm64", "arm64"},
 		{"ppc64el", "ppc64"},
 		{"ppc64le", "ppc64"},
 	} {