From patchwork Wed Sep 29 02:49:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 33413 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 8FB4427BBE1; Wed, 29 Sep 2021 03:51:23 +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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 1D04227BBE3 for ; Wed, 29 Sep 2021 03:51:23 +0100 (BST) Received: from localhost ([::1]:44020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVPgo-0004LR-2O for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 22:51:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVPgU-0004LD-MO for guix-patches@gnu.org; Tue, 28 Sep 2021 22:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVPgU-0007tT-El for guix-patches@gnu.org; Tue, 28 Sep 2021 22:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVPgU-0000IG-69 for guix-patches@gnu.org; Tue, 28 Sep 2021 22:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50884] [PATCH] import: go: Handle extra whitespace in "go-import" meta tags. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 02:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50884 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50884@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16328838101063 (code B ref -1); Wed, 29 Sep 2021 02:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Sep 2021 02:50:10 +0000 Received: from localhost ([127.0.0.1]:47408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVPfd-0000H5-Uz for submit@debbugs.gnu.org; Tue, 28 Sep 2021 22:50:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:47404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVPfc-0000Gy-SX for submit@debbugs.gnu.org; Tue, 28 Sep 2021 22:50:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVPfc-0004DK-GW for guix-patches@gnu.org; Tue, 28 Sep 2021 22:50:08 -0400 Received: from out1.migadu.com ([2001:41d0:2:863f::]:61068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVPfZ-0006u0-2H for guix-patches@gnu.org; Tue, 28 Sep 2021 22:50:08 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1632883800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qN80aSUN4S99rCh39H1P3SNUaiGOx0cU2B8iRxYdeBY=; b=ax8YCDaIILpAQ9U2qsxYYUGRcTnC1SbB/65O2NK0T4DZJXPEzGK+61ZPBxse3BifWXQj7Y 8Gy1cCFS75KjqzdPD5PNkBIoCj9mrMz/5hG/fJHvwjdhEoft49SjMgfDe3T9+7klgbGh3F WjUJj18z5PpxRl01f5LUP7efl+JCqj8= From: Sarah Morgensen Date: Tue, 28 Sep 2021 19:49:58 -0700 Message-Id: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:863f::; envelope-from=iskarian@mgsn.dev; helo=out1.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 Some packages sites use extra whitespace in the content portion of tags, so handle that. Example: * guix/import/go.scm (fetch-module-meta-data)[go-import->module-meta]: Use 'string-tokenize' instead of 'string-split'. --- guix/import/go.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: c582be4c38596a6a31a39c6799723dcd8b6eb909 diff --git a/guix/import/go.scm b/guix/import/go.scm index 9769b557ae..ca909ab35a 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -474,7 +474,7 @@ Optionally include a VERSION string to append to the name." because goproxy servers don't currently provide all the information needed to build a package." (define (go-import->module-meta content-text) - (match (string-split content-text #\space) + (match (string-tokenize content-text char-set:graphic) ((root-path vcs repo-url) (make-module-meta root-path (string->symbol vcs) (strip-.git-suffix/maybe repo-url)))))