Skip to content

Commit 49e8f4e

Browse files
committed
Fix conda nil issue
1 parent 0ce7d66 commit 49e8f4e

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

routers/api/packages/conda/conda.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ func EnumeratePackages(ctx *context.Context) {
140140

141141
versionMetadata := pd.Metadata.(*conda_module.VersionMetadata)
142142

143+
deps := fileMetadata.Dependencies
144+
if deps == nil {
145+
deps = []string{}
146+
}
147+
143148
pi := &PackageInfo{
144149
Name: pd.PackageProperties.GetByName(conda_module.PropertyName),
145150
Version: pd.Version.Version,
@@ -148,7 +153,7 @@ func EnumeratePackages(ctx *context.Context) {
148153
Timestamp: fileMetadata.Timestamp,
149154
Build: fileMetadata.Build,
150155
BuildNumber: fileMetadata.BuildNumber,
151-
Dependencies: fileMetadata.Dependencies,
156+
Dependencies: deps,
152157
License: versionMetadata.License,
153158
LicenseFamily: versionMetadata.LicenseFamily,
154159
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)