From f02af98ac5795fab6f9effa4c26c68a0c1a3c3ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 29 Aug 2021 18:39:43 +0300
Subject: [PATCH] nit: shorter defer body

---
 rootfs/rootfs.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rootfs/rootfs.go b/rootfs/rootfs.go
index 4a017e7..7aa6e06 100644
--- a/rootfs/rootfs.go
+++ b/rootfs/rootfs.go
@@ -153,9 +153,8 @@ func Flatten(rd io.ReadSeeker, w io.Writer, opts ...Option) (_err error) {
 	defer func() {
 		// Avoiding use of multierr: if error is present, return
 		// that. Otherwise return whatever `Close` returns.
-		err1 := tw.Close()
-		if _err == nil {
-			_err = err1
+		if err := tw.Close(); err != nil && _err == nil {
+			_err = err
 		}
 	}()
 	// iterate through all layers, all files, and write files.