From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id Yx1eLmTPAF9iRQAA0tVLHw (envelope-from ) for ; Sat, 04 Jul 2020 18:50:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uOPaKWTPAF9vDwAA1q6Kng (envelope-from ) for ; Sat, 04 Jul 2020 18:50:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 521EB9407C5 for ; Sat, 4 Jul 2020 18:50:12 +0000 (UTC) Received: from localhost ([::1]:60436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrnEp-0008RX-5a for larch@yhetil.org; Sat, 04 Jul 2020 14:50:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrmzC-0001xD-Hp for guix-patches@gnu.org; Sat, 04 Jul 2020 14:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrmzC-00025H-7S for guix-patches@gnu.org; Sat, 04 Jul 2020 14:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jrmzC-0004kR-3Z for guix-patches@gnu.org; Sat, 04 Jul 2020 14:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42192] [PATCH 1/3] import: launchpad: Handle list of source URLs correctly. References: <20200704182548.25280-1-arunisaac@systemreboot.net> In-Reply-To: <20200704182548.25280-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Jul 2020 18:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42192 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42192@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 42192-submit@debbugs.gnu.org id=B42192.159388762118208 (code B ref 42192); Sat, 04 Jul 2020 18:34:02 +0000 Received: (at 42192) by debbugs.gnu.org; 4 Jul 2020 18:33:41 +0000 Received: from localhost ([127.0.0.1]:59598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrmyr-0004ja-Af for submit@debbugs.gnu.org; Sat, 04 Jul 2020 14:33:41 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:34720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrmyp-0004jE-5L for 42192@debbugs.gnu.org; Sat, 04 Jul 2020 14:33:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=n4MSeyDGBg+yYUagf43iqkAMBptC/QihtHQxlAdQW7E=; b=GtUgHIKD1YXSY3pvhtkcTcdqHS UFG8JsXW72jzLm2bL8otqMAh8vO9MgXNnLMFvaOROF8RukEU6yq4F6WX9vcDqjoY1xR6xnqg+2X6J Lpyk4Hnj2XkqJ8TtPmltT9caJc7KwGT6Y+FqhLMP5Cw+m8BnFzYFPyKySJSU7/HsWMUM=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jrmyl-0004Fh-Ov; Sun, 05 Jul 2020 00:03:35 +0530 From: Arun Isaac Date: Sun, 5 Jul 2020 00:03:30 +0530 Message-Id: <20200704183332.25445-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=systemreboot.net header.s=default header.b=GtUgHIKD; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.09 X-TUID: XNAswZZrwfBR * guix/import/launchpad.scm (updated-launchpad-url): Return updated URL when package has a list of URLs, not the old URL. --- guix/import/launchpad.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index c7375837c7..1162cbe123 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Arun Isaac +;;; Copyright © 2019, 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,7 +66,7 @@ false if none is recognized" ((? string?) (updated-url source-uri)) ((source-uri ...) - (find updated-url source-uri)))))) + (any updated-url source-uri)))))) (_ #f))) (define (launchpad-package? package) -- 2.26.2