Skip to content

Commit 86a4503

Browse files
authored
Try fix for broken signature verification (#617)
* Try fix for broken signature verification * add news
1 parent e3cccdb commit 86a4503

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

conda_libmamba_solver/solver.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,18 @@ def _package_info_to_package_record(
636636
else:
637637
url = pkg.package_url
638638
url = percent_decode(url)
639+
640+
# Signature verification requires channel information _with_ subdir data
641+
channel = Channel(pkg.channel)
642+
if not channel.subdir:
643+
channel.platform = pkg.platform
644+
639645
return PackageRecord(
640646
name=pkg.name,
641647
version=pkg.version,
642648
build=pkg.build_string, # NOTE: Different attribute name
643649
build_number=pkg.build_number,
644-
channel=pkg.channel,
650+
channel=channel,
645651
url=url,
646652
subdir=pkg.platform, # NOTE: Different attribute name
647653
fn=pkg.filename, # NOTE: Different attribute name

news/617-signatures

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
### Enhancements
2+
3+
* <news item>
4+
5+
### Bug fixes
6+
7+
* Fix issue with content trust post-solve hooks that prevented signatures from being verified when the solved package records didn't include subdir information in their channel metadata. (#616 via #617)
8+
9+
### Deprecations
10+
11+
* <news item>
12+
13+
### Docs
14+
15+
* <news item>
16+
17+
### Other
18+
19+
* <news item>

0 commit comments

Comments
 (0)