guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: pack: Fix match error for multi-packages deb pack


From: guix-commits
Subject: branch master updated: pack: Fix match error for multi-packages deb packs.
Date: Sat, 23 Apr 2022 01:01:51 -0400

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 96dbcd7443 pack: Fix match error for multi-packages deb packs.
96dbcd7443 is described below

commit 96dbcd7443afed784ee45739db0b1ed1d8c36071
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Apr 23 00:46:14 2022 -0400

    pack: Fix match error for multi-packages deb packs.
    
    * 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>
---
 guix/scripts/pack.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 38bc021665..ebb3c6498f 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -5,9 +5,8 @@
 ;;; 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, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -750,7 +749,7 @@ Valid compressors are: ~a~%") compressor-name 
%valid-compressors)))
               (match (manifest-entries manifest)
                 ((entry)
                  entry)
-                (() #f)))
+                (_ #f)))
 
             (define package-name (or (and=> single-entry manifest-entry-name)
                                      (manifest->friendly-name manifest)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]