X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=remote%2Fsync%2Ffiles.go;h=e3fc3d981a8c17c91f78a21bade00e3f5e607619;hb=46b4e35255664aac9123231fc02500baac3c1955;hp=e0a2221009deda9824aa38419fec6ffc1decc0f0;hpb=9269fa3c94e700afc0be823f58ea473a2db8f3dc;p=safcm%2Fsafcm.git

diff --git a/remote/sync/files.go b/remote/sync/files.go
index e0a2221..e3fc3d9 100644
--- a/remote/sync/files.go
+++ b/remote/sync/files.go
@@ -285,9 +285,10 @@ reopen:
 		if err != nil {
 			return err
 		}
+		defer dh.Close()
+
 		err = dh.Chmod(file.Mode)
 		if err != nil {
-			dh.Close()
 			return err
 		}
 		// Less restrictive access is not relevant here because there
@@ -295,10 +296,8 @@ reopen:
 		debugf("chowning %d/%d", file.Uid, file.Gid)
 		err = dh.Chown(file.Uid, file.Gid)
 		if err != nil {
-			dh.Close()
 			return err
 		}
-		dh.Close()
 		return nil
 	}
 	// Directory: changed permission or user/group
@@ -523,7 +522,6 @@ func WriteTemp(dir, base string, data []byte, uid, gid int, mode fs.FileMode) (
 	}
 	err = fh.Close()
 	if err != nil {
-		fh.Close()
 		os.Remove(tmpPath)
 		return "", err
 	}