Shutdown progress bar in any case.

This commit is contained in:
Andrey Smirnov
2014-03-12 18:13:01 +04:00
parent 4dcfd74323
commit aade09e74e
+2 -4
View File
@@ -218,20 +218,18 @@ func DownloadTempWithChecksum(downloader aptly.Downloader, url string, expected
if expected.Size != -1 && downloader.GetProgress() != nil { if expected.Size != -1 && downloader.GetProgress() != nil {
downloader.GetProgress().InitBar(expected.Size, true) downloader.GetProgress().InitBar(expected.Size, true)
defer downloader.GetProgress().ShutdownBar()
} }
ch := make(chan error, 1) ch := make(chan error, 1)
downloader.DownloadWithChecksum(url, tempfile, ch, expected, ignoreMismatch) downloader.DownloadWithChecksum(url, tempfile, ch, expected, ignoreMismatch)
err = <-ch err = <-ch
if err != nil { if err != nil {
return nil, err return nil, err
} }
if expected.Size != -1 && downloader.GetProgress() != nil {
downloader.GetProgress().ShutdownBar()
}
file, err := os.Open(tempfile) file, err := os.Open(tempfile)
if err != nil { if err != nil {
return nil, err return nil, err