apteryx pushed a commit to branch wip-ipython-polyglossia in repository guix.
commit bc1be64914ffa14379476a96faca857d66129669 Author: Maxim Cournoyer <[email protected]> AuthorDate: Sat Apr 23 00:46:14 2022 -0400 pack: Fix match error when packing multiple packages in a deb archive. * guix/scripts/pack.scm (debian-archive)[single-entry]: Rename to single-entry? and fix definition. Adjust users. Reported-by: jgart <[email protected]> --- guix/scripts/pack.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 38bc021665..a203066cc2 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2018 Chris Marusich <[email protected]> ;;; Copyright © 2018 Efraim Flashner <[email protected]> ;;; Copyright © 2020 Tobias Geerinckx-Rice <[email protected]> -;;; Copyright © 2020 Maxim Cournoyer <[email protected]> +;;; Copyright © 2020, 2022 Maxim Cournoyer <[email protected]> ;;; Copyright © 2020 Eric Bavier <[email protected]> ;;; Copyright © 2021 Maxim Cournoyer <[email protected]> ;;; @@ -746,17 +746,14 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors))) (define manifest (profile-manifest #$profile)) - (define single-entry ;manifest entry - (match (manifest-entries manifest) - ((entry) - entry) - (() #f))) + (define single-entry? ;manifest entry + (= 1 (length (manifest-entries manifest)))) - (define package-name (or (and=> single-entry manifest-entry-name) + (define package-name (or (and=> single-entry? manifest-entry-name) (manifest->friendly-name manifest))) (define package-version - (or (and=> single-entry manifest-entry-version) + (or (and=> single-entry? manifest-entry-version) "0.0.0")) (define debian-format-version "2.0")
