octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-25 22:27:35 +00:00
Code Issues Releases Wiki Activity

Fix ineffassign mistakes

Browse Source
This commit is contained in:
Pauline Middelink 2017-05-17 01:25:52 +02:00
parent 4640d1a28e
commit 971ecee171
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.go
View File

@ -125,6 +125,7 @@ func copyFile(dst, src string) error {
if err != nil { if err != nil {
return err return err
} }
defer fsrc.Close()
if err = os.MkdirAll(filepath.Dir(dst), 0755); err != nil { if err = os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
fmt.Printf("MkdirAll(%v)\n", filepath.Dir(dst)) fmt.Printf("MkdirAll(%v)\n", filepath.Dir(dst))
@ -135,28 +136,17 @@ func copyFile(dst, src string) error {
if err != nil { if err != nil {
return err return err
} }
defer fdst.Close()
if _, err = io.Copy(fdst, fsrc); err != nil { _, err = io.Copy(fdst, fsrc)
return err
}
if err == nil {
err = fsrc.Close()
}
if err == nil {
err = fdst.Close()
}
if err == nil { if err == nil {
err = os.Chmod(dst, fi.Mode()) err = os.Chmod(dst, fi.Mode())
} }
if err == nil { if err == nil {
err = os.Chtimes(dst, fi.ModTime(), fi.ModTime()) 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 // die prints the message with fmt.Fprintf() to stderr and exits with an error

2
src/cmds/restic/integration_test.go
View File

@ -559,7 +559,7 @@ func TestBackupExclude(t *testing.T) {
opts.Excludes = []string{"*.tar.gz", "private/secret"} opts.Excludes = []string{"*.tar.gz", "private/secret"}
testRunBackup(t, []string{datadir}, opts, gopts) testRunBackup(t, []string{datadir}, opts, gopts)
snapshots, snapshotID = lastSnapshot(snapshots, loadSnapshotMap(t, gopts)) _, snapshotID = lastSnapshot(snapshots, loadSnapshotMap(t, gopts))
files = testRunLs(t, gopts, snapshotID) files = testRunLs(t, gopts, snapshotID)
Assert(t, !includes(files, filepath.Join(string(filepath.Separator), "testdata", "foo.tar.gz")), 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") "expected file %q not in first snapshot, but it's included", "foo.tar.gz")

4
src/restic/snapshot_filter_test.go
View File

@ -212,6 +212,10 @@ func TestApplyPolicy(t *testing.T) {
var want restic.Snapshots var want restic.Snapshots
err = json.Unmarshal(buf, &want) err = json.Unmarshal(buf, &want)
if err != nil {
t.Errorf("error unmarshalling golden file %v: %v", goldenFilename, err)
continue
}
if !reflect.DeepEqual(keep, want) { if !reflect.DeepEqual(keep, want) {
t.Errorf("test %v: wrong result, want:\n %v\ngot:\n %v", i, want, keep) t.Errorf("test %v: wrong result, want:\n %v\ngot:\n %v", i, want, keep)