[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/17: locate: Ignore unreadable manifests.
From: |
guix-commits |
Subject: |
01/17: locate: Ignore unreadable manifests. |
Date: |
Tue, 11 Jul 2023 11:01:31 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit e1c2c2f042e8741c0759e21e634cd2271e078177
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Jul 8 22:16:40 2023 +0200
locate: Ignore unreadable manifests.
Fixes <https://issues.guix.gnu.org/64187>.
* guix/scripts/locate.scm (profiles->manifest-entries): Wrap
'profile-manifest' in 'false-if-exception'.
Reported-by: Ricardo Wurmus <rekado@elephly.net>
---
guix/scripts/locate.scm | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/guix/scripts/locate.scm b/guix/scripts/locate.scm
index aeaffa3d34..79af533fd9 100644
--- a/guix/scripts/locate.scm
+++ b/guix/scripts/locate.scm
@@ -418,19 +418,24 @@ for each package to insert."
(()
entries)
((profile . rest)
- (let* ((manifest (profile-manifest profile))
- (entries visited
- (fold2 (lambda (entry lst visited)
- (let ((item (manifest-entry-item entry)))
- (if (set-contains? visited item)
- (values lst visited)
- (values (cons entry lst)
- (set-insert item
- visited)))))
- entries
- visited
- (manifest-transitive-entries manifest))))
- (loop visited rest entries))))))
+ (match (false-if-exception (profile-manifest profile))
+ (#f
+ ;; PROFILE's manifest is unreadable for some reason such as an
+ ;; unsupported version.
+ (loop visited rest entries))
+ (manifest
+ (let ((entries visited
+ (fold2 (lambda (entry lst visited)
+ (let ((item (manifest-entry-item entry)))
+ (if (set-contains? visited item)
+ (values lst visited)
+ (values (cons entry lst)
+ (set-insert item
+ visited)))))
+ entries
+ visited
+ (manifest-transitive-entries manifest))))
+ (loop visited rest entries))))))))
(define (insert-manifest-entry db entry)
"Insert a manifest ENTRY into DB."
- branch master updated (67e22584fa -> 7858b74b77), guix-commits, 2023/07/11
- 01/17: locate: Ignore unreadable manifests.,
guix-commits <=
- 09/17: gnu: qbittorrent: Update to 4.5.4., guix-commits, 2023/07/11
- 14/17: gnu: guile-hashing: Fix description., guix-commits, 2023/07/11
- 03/17: home: services: bash: Properly quote shell aliases., guix-commits, 2023/07/11
- 07/17: gnu: xorriso: Update to 1.5.6.pl02, guix-commits, 2023/07/11
- 06/17: gnu: hwloc: Update to 2.9.2., guix-commits, 2023/07/11
- 05/17: gnu: guile-chickadee: Change license to Apache 2.0., guix-commits, 2023/07/11
- 10/17: gnu: qbittorrent{,-nox}: Use qt-build-system., guix-commits, 2023/07/11
- 11/17: gnu: rxvt-unicode: Update to 9.31 [fixes CVE-2022-4170]., guix-commits, 2023/07/11
- 12/17: gnu: rxvt-unicode: Use new package style., guix-commits, 2023/07/11
- 15/17: gnu: desktop-file-utils: Format description., guix-commits, 2023/07/11