Skip to content

Commit

Permalink
Merge #4224 Reconcile compatibility after internal .ckan merge
Browse files Browse the repository at this point in the history
  • Loading branch information
HebaruSan committed Oct 5, 2024
2 parents 8c8a2d0 + 33e2e79 commit 989d4ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.

- [Core] Use SHA256 for archive.org fallback if SHA1 absent (#4216 by: HebaruSan)
- [Docs] Update rpm-repo.md (#4222 by: ratemisia; reviewed: HebaruSan)
- [Netkan] Reconcile compatibility after internal .ckan merge (#4224 by: HebaruSan)

## v1.35.0 (Oberth)

Expand Down
1 change: 1 addition & 0 deletions Netkan/Transformers/InternalCkanTransformer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions? opts
json.SafeAdd(property.Name, property.Value);
}

ModuleService.ApplyVersions(json, null, null, null);
json.SafeMerge("resources", internalJson["resources"]);

Log.DebugFormat("Transformed metadata:{0}{1}", Environment.NewLine, json);
Expand Down

0 comments on commit 989d4ba

Please sign in to comment.