guix-commits
[Top][All Lists]
Advanced

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

08/09: import: go: Fix goproxy option argument's format.


From: guix-commits
Subject: 08/09: import: go: Fix goproxy option argument's format.
Date: Fri, 14 May 2021 08:48:44 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit d456232712765c6fa7baf3de6b35431dfaab81b3
Author: Zheng Junjie <873216071@qq.com>
AuthorDate: Wed Apr 14 22:37:50 2021 +0800

    import: go: Fix goproxy option argument's format.
    
    Commit a8b927a562 Added new procedure go-module-available-versions use
    'string-append' to GOPROXY, but 'string->symbol' let GOPROXY is a symbol (it
    must be a string), which would lead to wrong-type-arg errors in the
    'string-append' procedure.
    
    * guix/scripts/import/go.scm (%options)[goproxy]: Remove call to
    'string->symbol'.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/scripts/import/go.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/guix/scripts/import/go.scm b/guix/scripts/import/go.scm
index 04b07f8..74e8e60 100644
--- a/guix/scripts/import/go.scm
+++ b/guix/scripts/import/go.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -68,9 +69,7 @@ that are not yet in Guix"))
                    (alist-cons 'recursive #t result)))
          (option '(#\p "goproxy") #t #f
                  (lambda (opt name arg result)
-                   (alist-cons 'goproxy
-                               (string->symbol arg)
-                               (alist-delete 'goproxy result))))
+                   (alist-cons 'goproxy arg (alist-delete 'goproxy result))))
          (option '("pin-versions") #f #f
                  (lambda (opt name arg result)
                    (alist-cons 'pin-versions? #t result)))



reply via email to

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