From patchwork Sun Feb 23 11:20:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 20388 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 796E827BBE4; Sun, 23 Feb 2020 11:21:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 ESMTP id 40A9A17B9D for ; Sun, 23 Feb 2020 11:21:11 +0000 (GMT) Received: from localhost ([::1]:51746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5pJu-0007Wk-QZ for patchwork@mira.cbaines.net; Sun, 23 Feb 2020 06:21:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58731) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5pJo-0007UA-GP for guix-patches@gnu.org; Sun, 23 Feb 2020 06:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5pJn-0004Yd-BG for guix-patches@gnu.org; Sun, 23 Feb 2020 06:21:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44464) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5pJm-0004YK-GA for guix-patches@gnu.org; Sun, 23 Feb 2020 06:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5pJm-00024e-CR for guix-patches@gnu.org; Sun, 23 Feb 2020 06:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39753] [PATCH] guix: swh: Handle absolute URLs being returned by the API. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Feb 2020 11:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39753@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15824568117884 (code B ref -1); Sun, 23 Feb 2020 11:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Feb 2020 11:20:11 +0000 Received: from localhost ([127.0.0.1]:50437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5pIw-000235-Ny for submit@debbugs.gnu.org; Sun, 23 Feb 2020 06:20:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:58641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5pIu-00022t-QC for submit@debbugs.gnu.org; Sun, 23 Feb 2020 06:20:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58648) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5pIt-0006wV-MN for guix-patches@gnu.org; Sun, 23 Feb 2020 06:20:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5pIs-00045n-Io for guix-patches@gnu.org; Sun, 23 Feb 2020 06:20:07 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:36000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j5pIs-00043a-8m for guix-patches@gnu.org; Sun, 23 Feb 2020 06:20:06 -0500 Received: (qmail 13442 invoked by uid 1009); 23 Feb 2020 12:19:58 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25731. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.010248 secs); 23 Feb 2020 11:19:58 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 23 Feb 2020 12:19:58 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Sun, 23 Feb 2020 12:20:33 +0100 Message-Id: <20200223112033.16166-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-Qmailux-2.08st: added fake Content-Type header X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * guix/swh.scm (swh-url): Don't prepend (%swh-base-url) if a domain is already present. This fixes the "guix lint: warning: while connecting to Software Heritage: host lookup failure: Name or service not known" error message. --- guix/swh.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index 8bdf9965f6..a948a8f28f 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -126,9 +126,16 @@ (make-parameter "https://archive.softwareheritage.org")) (define (swh-url path . rest) + ;; URLs returned by the API may be relative or absolute. This has changed + ;; without notice before. Handle both cases by detecting whether the path + ;; starts with a domain. + (define root + (if (string-prefix? "/" path) + (string-append (%swh-base-url) path) + path)) + (define url - (string-append (%swh-base-url) path - (string-join rest "/" 'prefix))) + (string-append root (string-join rest "/" 'prefix))) ;; Ensure there's a trailing slash or we get a redirect. (if (string-suffix? "/" url)