From 971ecee17118344e5d09751cb112deff7d0f8513 Mon Sep 17 00:00:00 2001
From: Pauline Middelink <middelin@google.com>
Date: Wed, 17 May 2017 01:25:52 +0200
Subject: [PATCH] Fix ineffassign mistakes

---
 build.go                            | 18 ++++--------------
 src/cmds/restic/integration_test.go |  2 +-
 src/restic/snapshot_filter_test.go  |  4 ++++
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/build.go b/build.go
index 4c3351d51..7b614f145 100644
--- a/build.go
+++ b/build.go
@@ -125,6 +125,7 @@ func copyFile(dst, src string) error {
 	if err != nil {
 		return err
 	}
+	defer fsrc.Close()
 
 	if err = os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
 		fmt.Printf("MkdirAll(%v)\n", filepath.Dir(dst))
@@ -135,28 +136,17 @@ func copyFile(dst, src string) error {
 	if err != nil {
 		return err
 	}
+	defer fdst.Close()
 
-	if _, err = io.Copy(fdst, fsrc); err != nil {
-		return err
-	}
-
-	if err == nil {
-		err = fsrc.Close()
-	}
-
-	if err == nil {
-		err = fdst.Close()
-	}
-
+	_, err = io.Copy(fdst, fsrc)
 	if err == nil {
 		err = os.Chmod(dst, fi.Mode())
 	}
-
 	if err == nil {
 		err = os.Chtimes(dst, fi.ModTime(), fi.ModTime())
 	}
 
-	return nil
+	return err
 }
 
 // die prints the message with fmt.Fprintf() to stderr and exits with an error
diff --git a/src/cmds/restic/integration_test.go b/src/cmds/restic/integration_test.go
index be1ce755e..e499e6394 100644
--- a/src/cmds/restic/integration_test.go
+++ b/src/cmds/restic/integration_test.go
@@ -559,7 +559,7 @@ func TestBackupExclude(t *testing.T) {
 
 		opts.Excludes = []string{"*.tar.gz", "private/secret"}
 		testRunBackup(t, []string{datadir}, opts, gopts)
-		snapshots, snapshotID = lastSnapshot(snapshots, loadSnapshotMap(t, gopts))
+		_, snapshotID = lastSnapshot(snapshots, loadSnapshotMap(t, gopts))
 		files = testRunLs(t, gopts, snapshotID)
 		Assert(t, !includes(files, filepath.Join(string(filepath.Separator), "testdata", "foo.tar.gz")),
 			"expected file %q not in first snapshot, but it's included", "foo.tar.gz")
diff --git a/src/restic/snapshot_filter_test.go b/src/restic/snapshot_filter_test.go
index 05e25fab6..1bf1e7460 100644
--- a/src/restic/snapshot_filter_test.go
+++ b/src/restic/snapshot_filter_test.go
@@ -212,6 +212,10 @@ func TestApplyPolicy(t *testing.T) {
 
 		var want restic.Snapshots
 		err = json.Unmarshal(buf, &want)
+		if err != nil {
+			t.Errorf("error unmarshalling golden file %v: %v", goldenFilename, err)
+			continue
+		}
 
 		if !reflect.DeepEqual(keep, want) {
 			t.Errorf("test %v: wrong result, want:\n  %v\ngot:\n  %v", i, want, keep)