From 354ef1d29ed9d9bb2d9bfe4b73306c550aab07fd Mon Sep 17 00:00:00 2001
From: "alex.schade" <39062967+aschade92@users.noreply.github.com>
Date: Tue, 15 Feb 2022 07:34:01 -0800
Subject: [PATCH] only overwrite err with closeErr if err is nil and closeErr
 is non nil

---
 src/cmd/go/internal/modfetch/fetch.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cmd/go/internal/modfetch/fetch.go b/src/cmd/go/internal/modfetch/fetch.go
index cb8435ee1c..21d5f54688 100644
--- a/src/cmd/go/internal/modfetch/fetch.go
+++ b/src/cmd/go/internal/modfetch/fetch.go
@@ -332,7 +332,7 @@ func hashZip(mod module.Version, zipfile, ziphashfile string) (err error) {
 		return err
 	}
 	defer func() {
-		if closeErr := hf.Close(); err != nil {
+		if closeErr := hf.Close(); err == nil && closeErr != nil {
 			err = closeErr
 		}
 	}()