From 6172491b91d089decd6e43ef5e2984701ce39c4c Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Wed, 22 Jan 2020 10:21:43 -0800 Subject: [PATCH] If input zip file cannot opened, print its name. Test: touch empty.zip; merge_zips out.zip empty.zip (output should contain `empty.zip: zip: not a valid zip file`) Change-Id: If707876af2301d7ad7d065c004cffb0c2491c7df --- cmd/merge_zips/merge_zips.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/merge_zips/merge_zips.go b/cmd/merge_zips/merge_zips.go index a9be612de..a95aca9f0 100644 --- a/cmd/merge_zips/merge_zips.go +++ b/cmd/merge_zips/merge_zips.go @@ -667,8 +667,10 @@ func (fiz *FileInputZip) Open() error { return nil } var err error - fiz.reader, err = zip.OpenReader(fiz.Name()) - return err + if fiz.reader, err = zip.OpenReader(fiz.Name()); err != nil { + return fmt.Errorf("%s: %s", fiz.Name(), err.Error()) + } + return nil } func main() {