[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
230/233: pack: Fix match error when packing multiple packages in a deb a
From: |
guix-commits |
Subject: |
230/233: pack: Fix match error when packing multiple packages in a deb archive. |
Date: |
Sun, 24 Apr 2022 23:40:10 -0400 (EDT) |
apteryx pushed a commit to branch wip-ipython-polyglossia
in repository guix.
commit bc1be64914ffa14379476a96faca857d66129669
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
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 <jgart@dismail.de>
---
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 <cmmarusich@gmail.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@@ -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")
- 211/233: gnu: python2-sqlalchemy: Skip a failing test., (continued)
- 211/233: gnu: python2-sqlalchemy: Skip a failing test., guix-commits, 2022/04/24
- 212/233: gnu: dynaconf: Fix build following python-click upgrade., guix-commits, 2022/04/24
- 213/233: gnu: python-numpydoc: Update to 1.2.1., guix-commits, 2022/04/24
- 214/233: gnu: python-sphinx: Update to 4.5.0., guix-commits, 2022/04/24
- 217/233: gnu: python-sphinx-click: Update to 4.0.3 and enable tests., guix-commits, 2022/04/24
- 220/233: gnu: python-sphinx-argparse: Update to 0.3.1., guix-commits, 2022/04/24
- 221/233: gnu: python-sphinx-cloud-sptheme: Update to 1.10.1 [still broken]., guix-commits, 2022/04/24
- 224/233: gnu: python-sphinx-autodoc-typehints: Update to 1.18.1., guix-commits, 2022/04/24
- 222/233: gnu: Add python-beartype., guix-commits, 2022/04/24
- 228/233: gnu: Add python-ipdb., guix-commits, 2022/04/24
- 230/233: pack: Fix match error when packing multiple packages in a deb archive.,
guix-commits <=
- 231/233: gnu: Add python-mpl-sphinx-theme., guix-commits, 2022/04/24
- 232/233: gnu: Add texlive-underscore., guix-commits, 2022/04/24