From d1937a530b6f33fac0a2207b452f7923c98edbe3 Mon Sep 17 00:00:00 2001 From: Michael Eischer <9106997+MichaelEischer@users.noreply.github.com> Date: Wed, 18 Feb 2026 20:43:10 +0100 Subject: [PATCH] clarify pack ID in decryption error (#5710) pack ID is included in full. In addition, the error message now says that it is a pack file. --- internal/repository/repository.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/repository/repository.go b/internal/repository/repository.go index e7a1b8c17..f1704291b 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -1280,7 +1280,7 @@ func (b *packBlobIterator) Next() (packBlobValue, error) { nonce, ciphertext := buf[:b.key.NonceSize()], buf[b.key.NonceSize():] plaintext, err := b.key.Open(ciphertext[:0], nonce, ciphertext, nil) if err != nil { - err = fmt.Errorf("decrypting blob %v from %v failed: %w", h, b.packID.Str(), err) + err = fmt.Errorf("decrypting blob %v from pack %v failed: %w", h, b.packID.String(), err) } if err == nil && entry.IsCompressed() { // DecodeAll will allocate a slice if it is not large enough since it @@ -1288,16 +1288,16 @@ func (b *packBlobIterator) Next() (packBlobValue, error) { b.decode, err = b.dec.DecodeAll(plaintext, b.decode[:0]) plaintext = b.decode if err != nil { - err = fmt.Errorf("decompressing blob %v from %v failed: %w", h, b.packID.Str(), err) + err = fmt.Errorf("decompressing blob %v from pack %v failed: %w", h, b.packID.String(), err) } } if err == nil { id := restic.Hash(plaintext) if !id.Equal(entry.ID) { - debug.Log("read blob %v/%v from %v: wrong data returned, hash is %v", - h.Type, h.ID, b.packID.Str(), id) - err = fmt.Errorf("read blob %v from %v: wrong data returned, hash is %v", - h, b.packID.Str(), id) + debug.Log("read blob %v/%v from pack %v: wrong data returned, hash is %v", + h.Type, h.ID, b.packID.String(), id) + err = fmt.Errorf("read blob %v from pack %v: wrong data returned, hash is %v", + h, b.packID.String(), id) } }