[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/40: gnu-maintenance: Do not crash on refresh when origin URI is a lis
From: |
guix-commits |
Subject: |
35/40: gnu-maintenance: Do not crash on refresh when origin URI is a list. |
Date: |
Tue, 5 Sep 2023 20:02:24 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit fd09e7b053c7e5dd24e5fb1b3cb9b2cc95a8bf7c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Sep 5 14:14:02 2023 -0400
gnu-maintenance: Do not crash on refresh when origin URI is a list.
Updating the simh package would fail with:
ice-9/boot-9.scm:1685:16: In procedure raise-exception: In procedure
string-prefix?: Wrong type argument in position 2 (expecting
string): ("http://simh.trailing-edge.com/sources/simhv312-4.zip"
"http://simh.trailing-edge.com/sources/archive/simhv312-4.zip")
This is because it expects a scalar value, but lists are allowed for URIs.
* guix/gnu-maintenance.scm (import-html-updatable-release): Check that URI
is
a string before checking if it has the mirror:// prefix.
---
guix/gnu-maintenance.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index ee6e0db747..41e0f4443d 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -980,7 +980,8 @@ the directory containing its source tarball. Optionally
include a VERSION
string to fetch a specific version."
(let* ((uri (string->uri
(match (origin-uri (package-source package))
- ((? (cut string-prefix? "mirror://" <>) url)
+ ((and (? string?)
+ (? (cut string-prefix? "mirror://" <>) url))
;; Retrieve the authoritative HTTP URL from a mirror.
(http-url? url))
((? string? url) url)
- 19/40: gnu: simh: Use G-Expressions., (continued)
- 19/40: gnu: simh: Use G-Expressions., guix-commits, 2023/09/05
- 34/40: gnu: ardour: Build locales., guix-commits, 2023/09/05
- 29/40: gnu: arcan: Build all features., guix-commits, 2023/09/05
- 32/40: gnu: arcan: Restyle format., guix-commits, 2023/09/05
- 38/40: gnu: python-skia-pathops: Update to 0.8.0., guix-commits, 2023/09/05
- 18/40: gnu: simh: Update to 3.12-4., guix-commits, 2023/09/05
- 39/40: Revert "guix: git: Avoid touching the network unless needed in 'reference-available?'.", guix-commits, 2023/09/05
- 27/40: gnu: xarcan: Fix indentation., guix-commits, 2023/09/05
- 36/40: gnu: skia: Update to 110.0.0f3fb7a., guix-commits, 2023/09/05
- 26/40: gnu: xarcan: Update to 0.6.1., guix-commits, 2023/09/05
- 35/40: gnu-maintenance: Do not crash on refresh when origin URI is a list.,
guix-commits <=
- 28/40: gnu: arcan: Update to 0.6.2.1., guix-commits, 2023/09/05
- 04/40: gnu: dosbox-staging: Update to 0.80.1., guix-commits, 2023/09/05
- 02/40: gnu: mpd: Remove unused imports., guix-commits, 2023/09/05
- 13/40: gnu: pantheon-calculator: Update to 2.0.2., guix-commits, 2023/09/05
- 11/40: gnu: ibus: Add search-path for 'GUIX_GTK3_IM_MODULE_FILE'., guix-commits, 2023/09/05
- 16/40: gnu: kaidan: Update to 0.9.0., guix-commits, 2023/09/05
- 30/40: gnu: arcan: Fix paths handling., guix-commits, 2023/09/05
- 21/40: gnu: lcrq: Update to 0.1.2., guix-commits, 2023/09/05
- 25/40: gnu: efivar: Fix cross-compilation., guix-commits, 2023/09/05
- 40/40: time-machine: Also validate the reference from a channels file., guix-commits, 2023/09/05