From a39e52b1cd39d5d3b80a8a379554461a4b31fbc8 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 11 Feb 2019 18:13:34 +0100 Subject: all: reformat with Go 1.10 --- pkg/build/akaros.go | 4 ++-- pkg/build/fuchsia.go | 2 +- pkg/vcs/vcs_test.go | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pkg') diff --git a/pkg/build/akaros.go b/pkg/build/akaros.go index cbc46326c..60750028f 100644 --- a/pkg/build/akaros.go +++ b/pkg/build/akaros.go @@ -86,8 +86,8 @@ bash return fmt.Errorf("failed to write image file: %v", err) } for src, dst := range map[string]string{ - ".config": "kernel.config", - "key": "key", + ".config": "kernel.config", + "key": "key", "obj/kern/akaros-kernel": "kernel", "obj/kern/akaros-kernel-64b": "obj/akaros-kernel-64b", } { diff --git a/pkg/build/fuchsia.go b/pkg/build/fuchsia.go index bb8b624a9..1f30887b0 100644 --- a/pkg/build/fuchsia.go +++ b/pkg/build/fuchsia.go @@ -28,7 +28,7 @@ func (fu fuchsia) build(targetArch, vmType, kernelDir, outputDir, compiler, user } for src, dst := range map[string]string{ "out/" + arch + "/obj/build/images/fvm.blk": "image", - ".ssh/pkey": "key", + ".ssh/pkey": "key", "out/build-zircon/build-" + arch + "/zircon.elf": "obj/zircon.elf", "out/build-zircon/build-" + arch + "/multiboot.bin": "kernel", "out/" + arch + "/fuchsia.zbi": "initrd", diff --git a/pkg/vcs/vcs_test.go b/pkg/vcs/vcs_test.go index 41d682aab..9e90090a4 100644 --- a/pkg/vcs/vcs_test.go +++ b/pkg/vcs/vcs_test.go @@ -31,13 +31,13 @@ func TestCheckRepoAddress(t *testing.T) { "https://anonscm.debian.org/git/kernel/linux.git": true, "git://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": true, "http://host.xz:123/path/to/repo.git/": true, - "": false, - "foobar": false, - "linux-next": false, - "foo://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, - "git://kernel/ubuntu.git": false, - "git://kernel.com/ubuntu": false, - "gitgit://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, + "": false, + "foobar": false, + "linux-next": false, + "foo://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, + "git://kernel/ubuntu.git": false, + "git://kernel.com/ubuntu": false, + "gitgit://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git": false, }) } -- cgit mrf-deployment