From patchwork Sat Jul 4 18:33:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 23047 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 93E6727BBE3; Sat, 4 Jul 2020 19:50:10 +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_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id 33DB227BBE1 for ; Sat, 4 Jul 2020 19:50:10 +0100 (BST) Received: from localhost ([::1]:60436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrnEn-0008RX-M2 for patchwork@mira.cbaines.net; Sat, 04 Jul 2020 14:50:09 -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 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 * 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) From patchwork Sat Jul 4 18:33:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 23046 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 04B5D27BBE3; Sat, 4 Jul 2020 19:46:17 +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_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id B9E6B27BBE1 for ; Sat, 4 Jul 2020 19:46:16 +0100 (BST) Received: from localhost ([::1]:39558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrnB2-00080U-4R for patchwork@mira.cbaines.net; Sat, 04 Jul 2020 14:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrmzD-0001z3-89 for guix-patches@gnu.org; Sat, 04 Jul 2020 14:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrmzC-00025P-TX 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-0004kg-Rm for guix-patches@gnu.org; Sat, 04 Jul 2020 14:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42192] [PATCH 2/3] import: launchpad: Recognize the .orig.tar.gz extension. 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.159388763018231 (code B ref 42192); Sat, 04 Jul 2020 18:34:02 +0000 Received: (at 42192) by debbugs.gnu.org; 4 Jul 2020 18:33:50 +0000 Received: from localhost ([127.0.0.1]:59602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrmyz-0004ju-RM for submit@debbugs.gnu.org; Sat, 04 Jul 2020 14:33:50 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:34718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrmyp-0004jD-5h 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:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=3W6fy5MkKhH2bA5vO+ymntKkXztGBPquX5g8ZIDJFPI=; b=Okmva8HqDkftOFqCM5WjJBPv0e /MN49ev1NcZwnBg6dPsAh0mvhO0VbYnavOmTSGpYNUhPzpawB5Su8zWQTrXLB3s14Q/45zUSK5qcN Z/3c7D0iN01mbbzJzYgRMw3dVujaiaLCnp1zguC6XvACaiSU7nurHpNc4YAy7NRVlU7c=; 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-Up; Sun, 05 Jul 2020 00:03:36 +0530 From: Arun Isaac Date: Sun, 5 Jul 2020 00:03:31 +0530 Message-Id: <20200704183332.25445-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200704183332.25445-1-arunisaac@systemreboot.net> References: <20200704183332.25445-1-arunisaac@systemreboot.net> MIME-Version: 1.0 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 * guix/import/launchpad.scm (find-extension): Recognize the .orig.tar.gz extension. --- guix/import/launchpad.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index 1162cbe123..c991ccfe6e 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -32,7 +32,7 @@ "Return the extension of the archive e.g. '.tar.gz' given a URL, or false if none is recognized" (find (lambda (x) (string-suffix? x url)) - (list ".tar.gz" ".tar.bz2" ".tar.xz" + (list ".orig.tar.gz" ".tar.gz" ".tar.bz2" ".tar.xz" ".zip" ".tar" ".tgz" ".tbz" ".love"))) (define (updated-launchpad-url old-package new-version) From patchwork Sat Jul 4 18:33:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 23048 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 6F99227BBE3; Sat, 4 Jul 2020 19:50:20 +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_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id 190FA27BBE1 for ; Sat, 4 Jul 2020 19:50:20 +0100 (BST) Received: from localhost ([::1]:32960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrnEx-0000KH-EN for patchwork@mira.cbaines.net; Sat, 04 Jul 2020 14:50:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrmzC-0001y7-Tb for guix-patches@gnu.org; Sat, 04 Jul 2020 14:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48057) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrmzC-00025L-Ix 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-0004kY-Fg for guix-patches@gnu.org; Sat, 04 Jul 2020 14:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42192] [PATCH 3/3] import: launchpad: Recognize more URLs. 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.159388762918225 (code B ref 42192); Sat, 04 Jul 2020 18:34:02 +0000 Received: (at 42192) by debbugs.gnu.org; 4 Jul 2020 18:33:49 +0000 Received: from localhost ([127.0.0.1]:59600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrmyr-0004jd-HF for submit@debbugs.gnu.org; Sat, 04 Jul 2020 14:33:49 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:34722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrmyp-0004jG-4r 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:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=v8m9yMJiZ/em8UnHU6jMll5EpQLiM5b4olljWqIPC0E=; b=qNtdUeTgvSoP92D6kF8cFpGKff f2qB6qrxNkDlwHdhmmg2p9BX630SORv9lL7nlueEKaq3BQAA1Lg7CGvdmp3V8MzjKilBoKr4ofz6F Fcxmmeb47sUO10b5ssb+f9qCO97sTt72Itad0Axn/RUep78kF5sBhyp90Q/3nhCtRnI8=; 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 1jrmym-0004Fh-BW; Sun, 05 Jul 2020 00:03:36 +0530 From: Arun Isaac Date: Sun, 5 Jul 2020 00:03:32 +0530 Message-Id: <20200704183332.25445-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200704183332.25445-1-arunisaac@systemreboot.net> References: <20200704183332.25445-1-arunisaac@systemreboot.net> MIME-Version: 1.0 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 * guix/import/launchpad.scm (updated-launchpad-url): Recognize more URLs. --- guix/import/launchpad.scm | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index c991ccfe6e..fd3cfa8444 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -46,15 +46,35 @@ false if none is recognized" (version (package-version old-package)) (repo (launchpad-repository url))) (cond - ((and - (>= (length (string-split version #\.)) 2) - (string=? (string-append "https://launchpad.net/" - repo "/" (version-major+minor version) - "/" version "/+download/" repo "-" version ext) - url)) + ((< (length (string-split version #\.)) 2) #f) + ((string=? (string-append "https://launchpad.net/" + repo "/" (version-major+minor version) + "/" version "/+download/" repo "-" version ext) + url) (string-append "https://launchpad.net/" repo "/" (version-major+minor new-version) "/" new-version "/+download/" repo "-" new-version ext)) + ((string=? (string-append "https://launchpad.net/" + repo "/" (version-major+minor version) + "/" version "/+download/" repo "_" version ext) + url) + (string-append "https://launchpad.net/" + repo "/" (version-major+minor new-version) + "/" new-version "/+download/" repo "-" new-version ext)) + ((string=? (string-append "https://launchpad.net/" + repo "/trunk/" version "/+download/" + repo "-" version ext) + url) + (string-append "https://launchpad.net/" + repo "/trunk/" new-version + "/+download/" repo "-" new-version ext)) + ((string=? (string-append "https://launchpad.net/" + repo "/trunk/" version "/+download/" + repo "_" version ext) + url) + (string-append "https://launchpad.net/" + repo "/trunk/" new-version + "/+download/" repo "_" new-version ext)) (#t #f))))) ; Some URLs are not recognised. (match (package-source old-package)