all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox] release file: extend component fixup to bookworm
Date: Thu, 29 Jun 2023 12:30:03 +0200	[thread overview]
Message-ID: <20230629103003.1021543-1-f.gruenbichler@proxmox.com> (raw)

else mirroring bookworm-security will skip *all* components..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Reported on the forum: https://forum.proxmox.com/threads/proxmox-offline-mirror-released.115219/page-3#post-568763

and fix verified by recompiling proxmox-offline-mirror with patched librust-proxmox-apt-dev

this special casing could maybe be moved to POM at some point..

 proxmox-apt/src/deb822/release_file.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/proxmox-apt/src/deb822/release_file.rs b/proxmox-apt/src/deb822/release_file.rs
index fcfedac..3973dad 100644
--- a/proxmox-apt/src/deb822/release_file.rs
+++ b/proxmox-apt/src/deb822/release_file.rs
@@ -347,9 +347,10 @@ impl TryFrom<ReleaseFileRaw> for ReleaseFile {
         if let Some(val) = value.extra_fields.get("Acquire-By-Hash") {
             parsed.aquire_by_hash = *val == "yes";
         }
-        // Fixup bullseye-security release files which have invalid components
+        // Fixup bullseye+-security release files which have invalid components
+        let codename = parsed.codename.as_deref();
         if parsed.label.as_deref() == Some("Debian-Security")
-            && parsed.codename.as_deref() == Some("bullseye-security")
+            && (codename == Some("bullseye-security") || codename == Some("bookworm-security"))
         {
             parsed.components = parsed
                 .components
-- 
2.39.2





             reply	other threads:[~2023-06-29 10:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-29 10:30 Fabian Grünbichler [this message]
2023-06-29 13:04 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230629103003.1021543-1-f.gruenbichler@proxmox.com \
    --to=f.gruenbichler@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal