From 1a93abcd69801877f5f7d2c76777add6901cab94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Sun, 20 Aug 2017 23:23:55 +0200 Subject: [PATCH] fix 'file already closed' in Go 1.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit License: MIT Signed-off-by: Ɓukasz Magiera --- commands/files/serialfile.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/commands/files/serialfile.go b/commands/files/serialfile.go index 0c5fbe776..b17d14af1 100644 --- a/commands/files/serialfile.go +++ b/commands/files/serialfile.go @@ -60,7 +60,14 @@ func (f *serialFile) NextFile() (File, error) { // if a file was opened previously, close it err := f.Close() if err != nil { - return nil, err + switch err2 := err.(type) { + case *os.PathError: + if err2.Err != os.ErrClosed { + return nil, err + } + default: + return nil, err + } } // if there aren't any files left in the root directory, we're done