mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-07 05:42:42 +00:00
Shutdown progress bar in any case.
This commit is contained in:
+2
-4
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user