mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-03-12 03:06:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed cases where nil was passed to errors.Wrap() causing nil to be returned (#747)

Browse Source
This commit is contained in:
Jarek Kowalski
2020-12-24 20:35:29 -08:00
committed by GitHub
parent f39de7fa57
commit d52af7cebb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repo/maintenance/maintenance_schedule.go
View File

@@ -87,7 +87,7 @@ func GetSchedule(ctx context.Context, rep MaintainableRepository) (*Schedule, er
}
if len(v) < c.NonceSize() {
return nil, errors.Wrap(err, "invalid schedule blob")
return nil, errors.Errorf("invalid schedule blob")
}
j, err := c.Open(nil, v[0:c.NonceSize()], v[c.NonceSize():], maintenanceScheduleAEADExtraData)

2
repo/object/object_manager.go
View File

@@ -354,7 +354,7 @@ func (om *Manager) newRawReader(ctx context.Context, objectID ID, assertLength i
}
if assertLength != -1 && int64(len(payload)) != assertLength {
return nil, errors.Wrapf(err, "unexpected chunk length %v, expected %v", len(payload), assertLength)
return nil, errors.Errorf("unexpected chunk length %v, expected %v", len(payload), assertLength)
}
return newObjectReaderWithData(payload), nil

2
repo/open.go
View File

@@ -214,7 +214,7 @@ func writeCacheMarker(cacheDir string) error {
return nil
}
if !os.IsNotExist(err) {
if err != nil && !os.IsNotExist(err) {
return errors.Wrap(err, "unexpected cache marker error")
}