Skip to content

Commit

Permalink
Merge branch 'root-v1.21-and-main' into release/dcs/v1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
richmahn committed Jan 18, 2024
2 parents cfe27bd + 3f5da09 commit 1082299
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions services/door43metadata/door43metadata.go
Expand Up @@ -493,6 +493,7 @@ func GetRCDoor43Metadata(dm *repo_model.Door43Metadata, repo *repo_model.Reposit
}
manifest, err = dcs.ReadYAMLFromBlob(blob)
if err != nil {
log.Error("ReadYAMLFromBlob: %v", err)
return err
}
dm.Metadata = manifest
Expand Down Expand Up @@ -587,11 +588,11 @@ func GetSBDoor43Metadata(dm *repo_model.Door43Metadata, repo *repo_model.Reposit
return nil
}
sbMetadata, err := dcs.GetSBDataFromBlob(blob)
dm.Metadata = sbMetadata.Metadata
if err != nil {
log.Error("ERROR: %v", err)
log.Error("GetSBDataFromBlob: %v", err)
return err
}
dm.Metadata = sbMetadata.Metadata

dm.ValidationError, err = dcs.ValidateMapBySB100Schema(sbMetadata.Metadata)
if err != nil {
Expand Down

0 comments on commit 1082299

Please sign in to comment.