octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-08 22:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Must verify success of from-network copy during upgrade (ref #1138)

Browse Source
This commit is contained in:
Jakob Borg 2014-12-22 10:42:47 +01:00
parent 7344a6205f
commit 23085eb5ae
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/upgrade/upgrade_supported.go
View File

@ -120,9 +120,6 @@ func readTarGZ(url string, dir string) (string, error) {
} }
tr := tar.NewReader(gr) tr := tar.NewReader(gr)
if err != nil {
return "", err
}
// Iterate through the files in the archive. // Iterate through the files in the archive.
for { for {
@ -143,14 +140,25 @@ func readTarGZ(url string, dir string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
io.Copy(of, tr)
_, err = io.Copy(of, tr)
if err != nil {
os.Remove(of.Name())
return "", err
}
err = of.Close() err = of.Close()
if err != nil { if err != nil {
os.Remove(of.Name()) os.Remove(of.Name())
return "", err return "", err
} }
os.Chmod(of.Name(), os.FileMode(hdr.Mode)) err = os.Chmod(of.Name(), os.FileMode(hdr.Mode))
if err != nil {
os.Remove(of.Name())
return "", err
}
return of.Name(), nil return of.Name(), nil
} }
} }