diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-07-08 22:16:40 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-07-11 15:47:55 +0200 |
| commit | e1c2c2f042e8741c0759e21e634cd2271e078177 (patch) | |
| tree | 65e5b0b95db2966e6fa2b383795ebedf2ca10dad | |
| parent | 67e22584faaa558c2a5834a5013d77660ec45e85 (diff) | |
| download | guix-e1c2c2f042e8741c0759e21e634cd2271e078177.tar.gz | |
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>
| -rw-r--r-- | guix/scripts/locate.scm | 31 |
1 files 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." |