Skip to content

Commit 5e7264f

Browse files
Bump c/storage to v1.59.0, c/image to v5.36.0
Possible replacement for containers#2476. I'm not sure if I messed something up when trying to merge in containers#2478 there, so thought I'd create this PR to see if I messed something up there when doing the merge/vendor. Signed-off-by: tomsweeneyredhat <[email protected]>
1 parent 6df5b01 commit 5e7264f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

internal/deepcopy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
v1 "github.com/opencontainers/image-spec/specs-go/v1"
88
)
99

10-
// DeepCopyDescriptor copies a Descriptor, deeply copying its contents
10+
// DeepCopyDescriptor copies a Descriptor, deeply copying its contents.
1111
func DeepCopyDescriptor(original *v1.Descriptor) *v1.Descriptor {
1212
tmp := *original
1313
if original.URLs != nil {

pkg/manifests/manifests_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ func TestAddInstance(t *testing.T) {
105105
t.Fatalf("adding an instance without platform info failed in %s: %v", version, err)
106106
}
107107
o, err := list.findOCIv1(manifestDigest)
108-
if o == nil || err != nil {
108+
if err != nil {
109109
t.Fatalf("adding an instance failed in %s: %v", version, err)
110110
}
111-
if o.Platform != nil {
111+
if o != nil && o.Platform != nil {
112112
t.Fatalf("added a Platform field (%+v) where none was expected: %v", o.Platform, err)
113113
}
114114
}

0 commit comments

Comments
 (0)