From 650f658244c1855de9b49c12241106aeb0a5e3f6 Mon Sep 17 00:00:00 2001 From: Michael Eischer <9106997+MichaelEischer@users.noreply.github.com> Date: Sun, 14 Jun 2026 13:56:24 +0200 Subject: [PATCH] repository/index: ensure progress bar cancelation on early index load failure (#21881) --- internal/repository/index/master_index.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/repository/index/master_index.go b/internal/repository/index/master_index.go index 91ad0ab51..500989c5a 100644 --- a/internal/repository/index/master_index.go +++ b/internal/repository/index/master_index.go @@ -281,6 +281,7 @@ func (mi *MasterIndex) MergeFinalIndexes() error { } func (mi *MasterIndex) Load(ctx context.Context, r restic.ListerLoaderUnpacked, p restic.Counter, cb func(id restic.ID, idx *Index, err error) error) error { + defer p.Done() indexList, err := restic.MemorizeList(ctx, r, restic.IndexFile) if err != nil { return err @@ -302,7 +303,6 @@ func (mi *MasterIndex) Load(ctx context.Context, r restic.ListerLoaderUnpacked, return err } p.SetMax(numIndexFiles) - defer p.Done() err = ForAllIndexes(ctx, indexList, r, func(id restic.ID, idx *Index, err error) error { if loadedIDs.Has(id) {