diff mbox series

[bug#70598] system: fix duplicate nss-certs check

Message ID 0f9cb434-38e4-70d8-4f89-9d81a8681ba5@nborghese.com
State New
Headers show
Series [bug#70598] system: fix duplicate nss-certs check | expand

Commit Message

nathan April 26, 2024, 11:30 p.m. UTC 
oops

Comments

Maxim Cournoyer April 28, 2024, 2:46 p.m. UTC | #1 
Hello!

nathan <nathan_mail@nborghese.com> writes:

> oops
>

Indeed, haha!  Thanks for the prompt fix, which I've now applied as
commit c85a7e1b2bea99783990b11baa7dbac1c448ce06.
diff mbox series

Patch

From 22f2511d50d1912191dd1bc69419b13370280018 Mon Sep 17 00:00:00 2001
Message-ID: <22f2511d50d1912191dd1bc69419b13370280018.1714173615.git.nathan_mail@nborghese.com>
From: nathan <nathan_mail@nborghese.com>
Date: Fri, 26 Apr 2024 19:12:42 -0400
Subject: [PATCH] system: fix duplicate nss-certs check

* gnu/system.scm (operating-system-packages): Because packages->manifest
allows other formats, don't assume it's a package object in the list.

Change-Id: I91c64ca2c463ef5c35fa23856e4622e364e58988
---
 gnu/system.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 025834328c..cb6e719ca6 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -325,7 +325,9 @@  (define (operating-system-packages os)
   ;; field contains a duplicated nss-certs packages.
   (let* ((packages (%operating-system-packages os))
          (nss-certs-packages (sort (filter (lambda (p)
-                                             (string=? "nss-certs" (package-name p)))
+                                             (and (package? p)
+                                                  (string=? "nss-certs"
+                                                            (package-name p))))
                                            packages)
                                    (lambda (x y)
                                      ;; Sort from newer to older versions.

base-commit: c81ed0970007810a4662edbc3474f5afc656fe95
-- 
2.41.0