projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
472caa7
)
14287: Remove extra panic after error running goimports.
author
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 4 Jul 2019 13:24:43 +0000
(09:24 -0400)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 4 Jul 2019 13:24:43 +0000
(09:24 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
lib/controller/federation/generate.go
patch
|
blob
|
history
diff --git
a/lib/controller/federation/generate.go
b/lib/controller/federation/generate.go
index 1f37df858ccb008b4f3744264b00a9fb72817279..11f021e518e4b5cdb0e0ff3d7aad946b27f87750 100644
(file)
--- a/
lib/controller/federation/generate.go
+++ b/
lib/controller/federation/generate.go
@@
-49,6
+49,7
@@
func main() {
panic(err)
}
go func() {
+ defer out.Close()
out.Write(regexp.MustCompile(`(?ms)^.*package .*?import.*?\n\)\n`).Find(buf))
io.WriteString(out, "//\n// -- this file is auto-generated -- do not edit -- edit list.go and run \"go generate\" instead --\n//\n\n")
for _, t := range []string{"Container", "Specimen"} {
@@
-57,10
+58,6
@@
func main() {
panic(err)
}
}
- err = out.Close()
- if err != nil {
- panic(err)
- }
}()
err = gofmt.Run()
if err != nil {