amorfo77/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2026-08-03 04:32:17 +00:00
Code Issues Projects Releases Wiki Activity

repository: rename PackError to ErrPackMetadata

Browse Source
This commit is contained in:
Michael Eischer
2026-06-10 22:20:28 +02:00
parent 4bc5eca7ea
commit ccddc1914d
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/restic/cmd_check.go
+1 -1
View File
@@ -307,7 +307,7 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts global.Options, args
go chkr.Packs(ctx, errChan) go chkr.Packs(ctx, errChan)
for err := range errChan { for err := range errChan {
var packErr *repository.PackError var packErr *repository.ErrPackMetadata
if errors.As(err, &packErr) { if errors.As(err, &packErr) {
if packErr.Orphaned { if packErr.Orphaned {
orphanedPacks++ orphanedPacks++
internal/checker/checker_test.go
+2 -2
View File
@@ -109,7 +109,7 @@ func TestMissingPack(t *testing.T) {
test.Assert(t, len(errs) == 1, test.Assert(t, len(errs) == 1,
"expected exactly one error, got %v", len(errs)) "expected exactly one error, got %v", len(errs))
if err, ok := errs[0].(*repository.PackError); ok { if err, ok := errs[0].(*repository.ErrPackMetadata); ok {
test.Equals(t, packID, err.ID) test.Equals(t, packID, err.ID)
} else { } else {
t.Errorf("expected error returned by checker.Packs() to be PackError, got %v", err) t.Errorf("expected error returned by checker.Packs() to be PackError, got %v", err)
@@ -137,7 +137,7 @@ func TestUnreferencedPack(t *testing.T) {
test.Assert(t, len(errs) == 1, test.Assert(t, len(errs) == 1,
"expected exactly one error, got %v", len(errs)) "expected exactly one error, got %v", len(errs))
if err, ok := errs[0].(*repository.PackError); ok { if err, ok := errs[0].(*repository.ErrPackMetadata); ok {
test.Equals(t, packID, err.ID.String()) test.Equals(t, packID, err.ID.String())
} else { } else {
t.Errorf("expected error returned by checker.Packs() to be PackError, got %v", err) t.Errorf("expected error returned by checker.Packs() to be PackError, got %v", err)
internal/repository/checker.go
+7 -6
View File
@@ -51,15 +51,16 @@ func (e *ErrMixedPack) Error() string {
return fmt.Sprintf("pack %v contains a mix of tree and data blobs", e.PackID.Str()) return fmt.Sprintf("pack %v contains a mix of tree and data blobs", e.PackID.Str())
} }
// PackError describes an error with a specific pack. // ErrPackMetadata describes an error with a specific pack. It is used for missing, truncated or orphaned packs.
type PackError struct { // Errors of the actual pack data are returned as ErrPackData.
type ErrPackMetadata struct {
ID restic.ID ID restic.ID
Orphaned bool Orphaned bool
Truncated bool Truncated bool
Err error Err error
} }
func (e *PackError) Error() string { func (e *ErrPackMetadata) Error() string {
return "pack " + e.ID.String() + ": " + e.Err.Error() return "pack " + e.ID.String() + ": " + e.Err.Error()
} }
@@ -214,7 +215,7 @@ func (c *Checker) Packs(ctx context.Context, errChan chan<- error) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
case errChan <- &PackError{ID: id, Err: errors.New("does not exist")}: case errChan <- &ErrPackMetadata{ID: id, Err: errors.New("does not exist")}:
} }
continue continue
} }
@@ -224,7 +225,7 @@ func (c *Checker) Packs(ctx context.Context, errChan chan<- error) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
case errChan <- &PackError{ID: id, Truncated: true, Err: errors.Errorf("unexpected file size: got %d, expected %d", reposize, size)}: case errChan <- &ErrPackMetadata{ID: id, Truncated: true, Err: errors.Errorf("unexpected file size: got %d, expected %d", reposize, size)}:
} }
} }
} }
@@ -234,7 +235,7 @@ func (c *Checker) Packs(ctx context.Context, errChan chan<- error) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
case errChan <- &PackError{ID: orphanID, Orphaned: true, Err: errors.New("not referenced in any index")}: case errChan <- &ErrPackMetadata{ID: orphanID, Orphaned: true, Err: errors.New("not referenced in any index")}:
} }
} }
} }