From patchwork Wed Apr 14 15:00:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 28549 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E043127BC75; Wed, 14 Apr 2021 16:02:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CCDB27BC74 for ; Wed, 14 Apr 2021 16:02:16 +0100 (BST) Received: from localhost ([::1]:45248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWh1z-0000yI-HK for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 11:02:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWh14-0000xa-HE for guix-patches@gnu.org; Wed, 14 Apr 2021 11:01:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWh0o-0006EE-TV for guix-patches@gnu.org; Wed, 14 Apr 2021 11:01:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWh0o-0004Zm-SU for guix-patches@gnu.org; Wed, 14 Apr 2021 11:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47776] [PATCH] import: go: Fix goproxy option argument's format. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47776 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47776@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161841244317541 (code B ref -1); Wed, 14 Apr 2021 15:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Apr 2021 15:00:43 +0000 Received: from localhost ([127.0.0.1]:35500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWh0V-0004Yq-4S for submit@debbugs.gnu.org; Wed, 14 Apr 2021 11:00:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:46828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1lWh0T-0004Yi-AI for submit@debbugs.gnu.org; Wed, 14 Apr 2021 11:00:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1lWh0S-0000nU-Th for guix-patches@gnu.org; Wed, 14 Apr 2021 11:00:40 -0400 Received: from out162-62-57-137.mail.qq.com ([162.62.57.137]:46181 helo=qq.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1lWh0I-0005qw-TW for guix-patches@gnu.org; Wed, 14 Apr 2021 11:00:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1618412423; bh=w9HaCTrGHPynJdF47+TAYA5wNCN6UAdmApCq1plecVo=; h=From:To:Subject:Date; b=qosKZ72XfkduFrLQQ7L4urLgiIU4AygqoxNQwjHtKPHvncKmIdDOIAnssuASz1h6X gAXFl3/4OWzwX3uKlUlCj/JKw7cTeaYQ/Ia26urKHMVwmuG4AFliKoRgkIK1zR7FzU 2OCTOaLWpP3zaPN871AV07OR5UOgq+2JE3+fcwAQ= Received: from Z572 ([2409:8928:1254:28fc:3b2a:e107:5cc0:3538]) by newxmesmtplogicsvrsza6.qq.com (NewEsmtp) with SMTP id 153A470; Wed, 14 Apr 2021 23:00:21 +0800 X-QQ-mid: xmsmtpt1618412421tkw9rdiv7 Message-ID: X-QQ-XMAILINFO: MwtEirz3hF6ozo7pwkXbXdN97xZk9xBwtsuczeVFUokRbUwce/12DvnpKckE/g vBZ7HtF05H6DDJuBiylsj/OQ8kpYmG4NcDKD+E/c3j+56vvjZhns2Oer3S7PkbPbrxKDlF8X8GAw aOA+NeLkXU0Un2dFznOuEqGawg1JcQoUR4P1OiCK9fHOtyq610fzIAayEM4E+CG3VyH74ke+DmxX BnZZUtWaErCfceAbqQZ34PF38Wa2rTxuVOVET9q8YvXucoI//YSzeGCagmvkT37rlkaHU1MPEj1n VEd/hxX/8hAgLxbY/lGY+Q8xTZqY8Fb2aiRt+JVvPPZ4sBLZZM09EH5zqPpWiK0belDMg45Vw0kU 9kaWpIsBphuI6Y8GvWG3s9rO2RsxMyT2I8BZZmsfN/hR+frNqVmfXZtCTqGA1KhAC7k2XFwkGHqK kaJhqlwZVxS4eE81OLcQJRTkUjsMAnBsUKGSxBBfjPbJTTQt8w0LVeg3FEZxrjCGfVZMGAKqMqcM LJixsmTepgPTNNhcwnRGK6ww8ET/2gJJ+0RkjVHixHV4SLT8DU+QaZ2eLsz/KhYmbjtUxa+rsgT0 gWlThO36eoukg9H2W6HE3OPepx0iwPgPp1+/qdLWExvJOOpa/oOKP62bVELMEXdwrcb17mahslft NJHjhUqPYiZOUPY8VZym/BXqhEDhlfKgX+Pfrpt+2fqS0dwD45gNN5ewWmCWwqjopk4HEa7ueZFQ 7E From: Z572 <873216071@qq.com> Date: Wed, 14 Apr 2021 23:00:20 +0800 Message-ID: <878s5k9aij.fsf@qq.com> MIME-Version: 1.0 Content-Disposition: inline; filename=0001-import-go-Fix-goproxy-option-argument-s-format.patch Received-SPF: pass client-ip=162.62.57.137; envelope-from=873216071@qq.com; helo=qq.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From e34f281d39f9b1e247fa649a15657da70f2b548d Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Wed, 14 Apr 2021 22:37:50 +0800 Subject: [PATCH] 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'. --- 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 04b07f80cc..74e8e60cce 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 ;;; Copyright © 2021 Maxim Cournoyer +;;; 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))) -- 2.31.1