Browse code

builder-next: call stopprogress on download error

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 91a57f3e7f5ed569f7b9d97d14de11bb324bb8e0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Tonis Tiigi authored on 2019/05/14 09:01:13
Showing 1 changed files
... ...
@@ -545,10 +545,10 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) {
545 545
 
546 546
 	r := image.NewRootFS()
547 547
 	rootFS, release, err := p.is.DownloadManager.Download(ctx, *r, runtime.GOOS, layers, pkgprogress.ChanOutput(pchan))
548
+	stopProgress()
548 549
 	if err != nil {
549 550
 		return nil, err
550 551
 	}
551
-	stopProgress()
552 552
 
553 553
 	ref, err := p.is.CacheAccessor.GetFromSnapshotter(ctx, string(rootFS.ChainID()), cache.WithDescription(fmt.Sprintf("pulled from %s", p.ref)))
554 554
 	release()