[pve-devel] [PATCH proxmox-offline-mirror 3/8] wizard: switch to .pgp for Debian keyring files
Fabian Grünbichler
f.gruenbichler at proxmox.com
Tue Sep 9 10:24:38 CEST 2025
On September 8, 2025 3:53 pm, Shannon Sterz wrote:
> On Mon Sep 8, 2025 at 3:16 PM CEST, Fabian Grünbichler wrote:
>> .gpg is only used for backwards-compat via a symlink
>>
>> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
>> ---
>> src/bin/proxmox-offline-mirror.rs | 17 +++++++++--------
>> 1 file changed, 9 insertions(+), 8 deletions(-)
>>
>> diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs
>> index 9b8a230..fb0f43e 100644
>> --- a/src/bin/proxmox-offline-mirror.rs
>> +++ b/src/bin/proxmox-offline-mirror.rs
>> @@ -162,26 +162,27 @@ fn derive_debian_repo(
>> };
>>
>> let url = format!("{url} {components}");
>> +
>> let key = match (release, variant) {
>> (Release::Trixie, DebianVariant::Security) => {
>> - "/usr/share/keyrings/debian-archive-trixie-security-automatic.gpg"
>> + "/usr/share/keyrings/debian-archive-trixie-security-automatic.pgp"
>> }
>> (Release::Trixie, DebianVariant::Updates) | (Release::Trixie, DebianVariant::Backports) => {
>> - "/usr/share/keyrings/debian-archive-trixie-automatic.gpg"
>> + "/usr/share/keyrings/debian-archive-trixie-automatic.pgp"
>> }
>> - (Release::Trixie, _) => "/usr/share/keyrings/debian-archive-trixie-stable.gpg",
>> + (Release::Trixie, _) => "/usr/share/keyrings/debian-archive-trixie-stable.pgp",
>> (Release::Bookworm, DebianVariant::Security) => {
>> - "/usr/share/keyrings/debian-archive-bookworm-security-automatic.gpg"
>> + "/usr/share/keyrings/debian-archive-bookworm-security-automatic.pgp"
>> }
>> (Release::Bookworm, DebianVariant::Updates)
>> | (Release::Bookworm, DebianVariant::Backports) => {
>> - "/usr/share/keyrings/debian-archive-bookworm-automatic.gpg"
>> + "/usr/share/keyrings/debian-archive-bookworm-automatic.pgp"
>> }
>> - (Release::Bookworm, _) => "/usr/share/keyrings/debian-archive-bookworm-stable.gpg",
>> + (Release::Bookworm, _) => "/usr/share/keyrings/debian-archive-bookworm-stable.pgp",
>> (Release::Bullseye, DebianVariant::Security) => {
>> - "/usr/share/keyrings/debian-archive-bullseye-security-automatic.gpg"
>> + "/usr/share/keyrings/debian-archive-bullseye-security-automatic.pgp"
>> }
>> - (Release::Bullseye, _) => "/usr/share/keyrings/debian-archive-bullseye-automatic.gpg",
>> + (Release::Bullseye, _) => "/usr/share/keyrings/debian-archive-bullseye-automatic.pgp",
>> (Release::Buster, DebianVariant::Security) => {
>> "/usr/share/keyrings/debian-archive-buster-security-automatic.gpg"
>> }
>
> couldn't we do something similar as before (patch 1 of this series)
> here too to simplify this match statement? for example:
>
> let key = match (release, variant) {
> (_, DebianVariant::Security) => {
> &format!("/usr/share/keyrings/debian-archive-{release}-security-automatic.pgp")
> }
> (Release::Bullseye, _) => "/usr/share/keyrings/debian-archive-bullseye-automatic.pgp",
> (
> Release::Trixie | Release::Bookworm,
> DebianVariant::Updates | DebianVariant::Backports,
> ) => &format!("/usr/share/keyrings/debian-archive-{release}-automatic.pgp)"),
> _ => &format!("/usr/share/keyrings/debian-archive-{release}-stable.pgp"),
> };
>
> or do we want to keep it as-is for clarity? (note i already dropped the
> buster variant here)
I tried to limit myself to instances where the code got shorter without
losing much (or any ;)) readability, and this one didn't make that cut
for me..
More information about the pve-devel
mailing list