Skip to content

Commit bfaddbc

Browse files
authored
Fix conda null depend issue (#35900)
Fix #35895
1 parent 0ce7d66 commit bfaddbc

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

routers/api/packages/conda/conda.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func EnumeratePackages(ctx *context.Context) {
148148
Timestamp: fileMetadata.Timestamp,
149149
Build: fileMetadata.Build,
150150
BuildNumber: fileMetadata.BuildNumber,
151-
Dependencies: fileMetadata.Dependencies,
151+
Dependencies: util.SliceNilAsEmpty(fileMetadata.Dependencies),
152152
License: versionMetadata.License,
153153
LicenseFamily: versionMetadata.LicenseFamily,
154154
HashMD5: pfd.Blob.HashMD5,

tests/integration/api_packages_conda_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ func TestPackageConda(t *testing.T) {
237237
assert.Equal(t, pd.Files[0].Blob.HashMD5, packageInfo.HashMD5)
238238
assert.Equal(t, pd.Files[0].Blob.HashSHA256, packageInfo.HashSHA256)
239239
assert.Equal(t, pd.Files[0].Blob.Size, packageInfo.Size)
240+
assert.NotNil(t, packageInfo.Dependencies)
241+
assert.Empty(t, packageInfo.Dependencies)
240242
})
241243

242244
t.Run(".conda", func(t *testing.T) {
@@ -268,6 +270,8 @@ func TestPackageConda(t *testing.T) {
268270
assert.Equal(t, pd.Files[0].Blob.HashMD5, packageInfo.HashMD5)
269271
assert.Equal(t, pd.Files[0].Blob.HashSHA256, packageInfo.HashSHA256)
270272
assert.Equal(t, pd.Files[0].Blob.Size, packageInfo.Size)
273+
assert.NotNil(t, packageInfo.Dependencies)
274+
assert.Empty(t, packageInfo.Dependencies)
271275
})
272276
})
273277
}

0 commit comments

Comments
 (0)