public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH proxmox] release file: extend component fixup to bookworm
@ 2023-06-29 10:30 Fabian Grünbichler
  2023-06-29 13:04 ` [pve-devel] applied: " Thomas Lamprecht
  0 siblings, 1 reply; 2+ messages in thread
From: Fabian Grünbichler @ 2023-06-29 10:30 UTC (permalink / raw)
  To: pve-devel

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





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [pve-devel] applied: [PATCH proxmox] release file: extend component fixup to bookworm
  2023-06-29 10:30 [pve-devel] [PATCH proxmox] release file: extend component fixup to bookworm Fabian Grünbichler
@ 2023-06-29 13:04 ` Thomas Lamprecht
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2023-06-29 13:04 UTC (permalink / raw)
  To: Proxmox VE development discussion, Fabian Grünbichler

Am 29/06/2023 um 12:30 schrieb Fabian Grünbichler:
> 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(-)
> 
>

applied, thanks!




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-06-29 13:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-29 10:30 [pve-devel] [PATCH proxmox] release file: extend component fixup to bookworm Fabian Grünbichler
2023-06-29 13:04 ` [pve-devel] applied: " Thomas Lamprecht

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal