Merge lp:~wallyworld/juju-core/fix-reported-arch-arm64 into lp:~go-bot/juju-core/trunk
Proposed by
Ian Booth
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ian Booth | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2600 | ||||
Proposed branch: | lp:~wallyworld/juju-core/fix-reported-arch-arm64 | ||||
Merge into: | lp:~go-bot/juju-core/trunk | ||||
Diff against target: |
24 lines (+2/-1) 2 files modified
juju/arch/arch.go (+1/-1) juju/arch/arch_test.go (+1/-0) |
||||
To merge this branch: | bzr merge lp:~wallyworld/juju-core/fix-reported-arch-arm64 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+215074@code.launchpad.net |
Commit message
Fix reported arch on arm64 machines
There was an error in NormaliseArch() which
caused the architecture on arm64 machines to
be misreported as armhf
Description of the change
Fix reported arch on arm64 machines
There was an error in NormaliseArch() which
caused the architecture on arm64 machines to
be misreported as armhf
To post a comment you must log in.
Reviewers: mp+215074_ code.launchpad. net,
Message:
Please take a look.
Description:
Fix reported arch on arm64 machines
There was an error in NormaliseArch() which
caused the architecture on arm64 machines to
be misreported as armhf
https:/ /code.launchpad .net/~wallyworl d/juju- core/fix- reported- arch-arm64/ +merge/ 215074
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/86360043/
Affected files (+4, -1 lines): arch_test. go
A [revision details]
M juju/arch/arch.go
M juju/arch/
Index: [revision details] 20140410013109- sz235hrw7hnxape i
=== 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: juju/arch/arch.go MustCompile( "amd64| x86_64" ), AMD64}, MustCompile( "i?[3-9] 86"), I386}, MustCompile( "arm|armv. *"), ARM}, MustCompile( "(arm$) |(armv. *)"), ARM}, MustCompile( "aarch64" ), ARM64}, MustCompile( "ppc64el| ppc64le" ), PPC64},
=== modified file 'juju/arch/arch.go'
--- juju/arch/arch.go 2014-04-09 16:36:12 +0000
+++ juju/arch/arch.go 2014-04-10 04:05:56 +0000
@@ -35,7 +35,7 @@
}{
{regexp.
{regexp.
- {regexp.
+ {regexp.
{regexp.
{regexp.
}
Index: juju/arch/ arch_test. go arch_test. go' arch_test. go 2014-04-09 16:36:12 +0000 arch_test. go 2014-04-10 04:05:56 +0000
=== modified file 'juju/arch/
--- juju/arch/
+++ juju/arch/
@@ -37,6 +37,7 @@
{"armv", "armhf"},
{"armv7", "armhf"},
{"aarch64", "arm64"},
+ {"arm64", "arm64"},
{"ppc64el", "ppc64"},
{"ppc64le", "ppc64"},
} {