me/guix
Archived
1
0
Fork 0
Code Activity

pack: Fix match error for multi-packages deb packs.

Browse source 
* guix/scripts/pack.scm: Remove duplicated copyright line.
(debian-archive)[single-entry]: Match one or anything, not one or zero.

Reported-by: jgart <jgart@dismail.de>
This commit is contained in:
Maxim Cournoyer 2022-04-23 00:46:14 -04:00
parent e32cc011bb
commit 96dbcd7443
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
guix/scripts/pack.scm
View file

@ -5,9 +5,8 @@
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -750,7 +749,7 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors)))
(match (manifest-entries manifest) (match (manifest-entries manifest)
((entry) ((entry)
entry) entry)
(() #f))) (_ #f)))
(define package-name (or (and=> single-entry manifest-entry-name) (define package-name (or (and=> single-entry manifest-entry-name)
(manifest->friendly-name manifest))) (manifest->friendly-name manifest)))