From 0d6e0c6425df80e31d4ded318ab1ff99c3173f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salm=C4=81n=20Aljamm=C4=81z?= Date: Wed, 8 Oct 2014 18:40:00 +0100 Subject: [PATCH] index: avoid shadowing err when retrying to index a full file Change-Id: Ie683739039116dfb2758c6647382afebaa6e1ece --- pkg/index/receive.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/index/receive.go b/pkg/index/receive.go index 773f57e32..6487b853d 100644 --- a/pkg/index/receive.go +++ b/pkg/index/receive.go @@ -393,7 +393,8 @@ func (ix *Index) populateFile(fetcher blob.Fetcher, b *schema.Blob, mm *mutation conf, err := images.DecodeConfig(bytes.NewReader(imageBuf.Bytes)) // If our optimistic 512KB in-memory prefix from above was too short to get the dimensions, pass the whole thing instead and try again. if err == io.ErrUnexpectedEOF { - fr, err := b.NewFileReader(fetcher) + var fr *schema.FileReader + fr, err = b.NewFileReader(fetcher) if err == nil { conf, err = images.DecodeConfig(fr) fr.Close() @@ -411,7 +412,8 @@ func (ix *Index) populateFile(fetcher blob.Fetcher, b *schema.Blob, mm *mutation err = indexEXIF(wholeRef, bytes.NewReader(imageBuf.Bytes), mm) if err == io.EOF { - fr, err := b.NewFileReader(fetcher) + var fr *schema.FileReader + fr, err = b.NewFileReader(fetcher) if err == nil { err = indexEXIF(wholeRef, fr, mm) fr.Close()