guix-commits
[Top][All Lists]
Advanced

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

branch master updated: import: go: Fix match-error in 'go-package-descri


From: guix-commits
Subject: branch master updated: import: go: Fix match-error in 'go-package-description'
Date: Mon, 28 Jun 2021 02:53:15 -0400

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

hoebjo pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 9d91524  import: go: Fix match-error in 'go-package-description'
9d91524 is described below

commit 9d9152425e96c408357d0f4961767a5c08076c13
Author: Sarah Morgensen via Guix-patches via <guix-patches@gnu.org>
AuthorDate: Wed Jun 23 15:46:46 2021 -0700

    import: go: Fix match-error in 'go-package-description'
    
    * guix/import/go.scm (go-package-description): Make sure description* is
    always a list, so the result is properly matched.
    
    Signed-off-by: Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
---
 guix/import/go.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/import/go.scm b/guix/import/go.scm
index d110954..5e23d6a 100644
--- a/guix/import/go.scm
+++ b/guix/import/go.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -186,8 +187,9 @@ e.g. \"google.golang.org/protobuf/proto\"."
          (description (if (not (null? overview))
                           overview
                           (select-content sxml)))
-         (description* (and (not (null? description))
-                            (first description))))
+         (description* (if (not (null? description))
+                           (first description)
+                           description)))
     (match description*
       (() #f)                           ;nothing selected
       ((p elements ...)



reply via email to

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