From unknown Fri Jun 20 19:52:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Jan 2019 10:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34097 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34097@debbugs.gnu.org Cc: Eric Bavier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154763362228224 (code B ref -1); Wed, 16 Jan 2019 10:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jan 2019 10:13:42 +0000 Received: from localhost ([127.0.0.1]:60680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjiCb-0007L9-RN for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjiCa-0007Kw-0I for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:43220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjiCU-0000y9-Jq for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjiCR-0004sN-Hk for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:34 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjiCQ-0000Oy-2s for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:31 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:50962) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjiCP-0008Bc-HH for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: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=0jisTuCJkFgEgTElvV0KayzIvrtOsi48UU0JfYACpfc=; b=Y0lrpaOZm8kxcktzELd2Wcx8KC Gr4GopIbaCyPRfmi6IkGMN46f4LUAPMqHaqGtQ5VP6A/S9AxU4xYCyeL6giuZKVk3t09I/jx5VsG6 a0xQzAroOUd0/sxFTnpsHA71sE7bJcrU6QU9NoiWjBzim/S6ON8vp2SPC8YsHc9iIhR4=; Received: from [14.139.128.10] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gjiCI-0002XH-2S; Wed, 16 Jan 2019 15:43:23 +0530 From: Arun Isaac Date: Wed, 16 Jan 2019 15:43:09 +0530 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.77.148.100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain During `guix refresh PACKAGE`, the source URI for packages using git-fetch need not be updated. It can be returned unchanged, as it is. The attached patch does that. As a side issue, without this patch, git-fetch packages that do not have a source URI ending in ".git" are not updated correctly using `guix refresh PACKAGE`. See the package emacs-evil for an example. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-import-github-Do-not-update-URI-for-packages-using-g.patch Content-Transfer-Encoding: quoted-printable From=20f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 16 Jan 2019 15:21:06 +0530 Subject: [PATCH] import: github: Do not update URI for packages using git-fetch. * guix/import/github.scm (updated-github-url): Return the unchanged source = URI for packages using git-fetch. [updated-url]: Do not handle URIs which end with ".git". =2D-- guix/import/github.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/github.scm b/guix/import/github.scm index ad662e7b02..b287313d98 100644 =2D-- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2016 Ben Woodcroft ;;; Copyright =C2=A9 2017, 2018 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2018 Eric Bavier +;;; Copyright =C2=A9 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,7 +55,6 @@ false if none is recognized" (github-user-slash-repository url))) (repo (github-repository url))) (cond =2D ((string-suffix? ".git" url) url) ((string-suffix? (string-append "/tarball/v" version) url) (string-append prefix "/tarball/v" new-version)) ((string-suffix? (string-append "/tarball/" version) url) @@ -99,7 +99,7 @@ false if none is recognized" ((source-uri ...) (find updated-url source-uri)))) ((eq? fetch-method download:git-fetch) =2D (updated-url (download:git-reference-url source-uri))) + (download:git-reference-url source-uri)) (else #f)))) =20 (define (github-package? package) =2D-=20 2.19.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAlw/A7YACgkQLiXui2GA K7PO5wf/diiA1PeSgODbRhxpr7EdeDNmnU5h0kN8AgdHDulw4FSCXmBreqHv6vJz MO3+DrOnHtsj7qDOf1PE3liRySdDOHUAxn0Ya9neJxWvoAMMir/GvJJjKuszpu2H p/iUrsKsBEdfdUKQf34Sn34nnUf8nxPjfowEL/bxMru2+SjvkVhVJwF2xtWIUH/4 e67OP0h37KWt6sQdEQCv5zrcDeSE7utcYfpibw3e+ZgBoiMrknt+U5lMzkfMhm/f XJM35EAFP+q4hZDv4aFPTvKRXHSr6nqhgv/lQqWOYSU2lQp5yB094tDDyiAU9l54 WdQjmm4/T0cBoWc5WuguM4DPyVgJoA== =bn0r -----END PGP SIGNATURE----- --==-=-=-- From unknown Fri Jun 20 19:52:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Jan 2019 10:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34097 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 34097@debbugs.gnu.org, Eric Bavier Received: via spool by 34097-submit@debbugs.gnu.org id=B34097.15476356876933 (code B ref 34097); Wed, 16 Jan 2019 10:49:02 +0000 Received: (at 34097) by debbugs.gnu.org; 16 Jan 2019 10:48:07 +0000 Received: from localhost ([127.0.0.1]:60749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjijv-0001nk-F9 for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:48:07 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:46474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjijr-0001nZ-PF for 34097@debbugs.gnu.org; Wed, 16 Jan 2019 05:48:05 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id F09431C49; Wed, 16 Jan 2019 11:48:01 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yIQ_RzSZRbVV; Wed, 16 Jan 2019 11:48:01 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id EA5AE6CC; Wed, 16 Jan 2019 11:48:00 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Wed, 16 Jan 2019 11:48:00 +0100 In-Reply-To: (Arun Isaac's message of "Wed, 16 Jan 2019 15:43:09 +0530") Message-ID: <878szkx4in.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, Arun Isaac skribis: > During `guix refresh PACKAGE`, the source URI for packages using > git-fetch need not be updated. It can be returned unchanged, as it > is. The attached patch does that. > > As a side issue, without this patch, git-fetch packages that do not have > a source URI ending in ".git" are not updated correctly using `guix > refresh PACKAGE`. See the package emacs-evil for an example. > > From f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001 > From: Arun Isaac > Date: Wed, 16 Jan 2019 15:21:06 +0530 > Subject: [PATCH] import: github: Do not update URI for packages using > git-fetch. > > * guix/import/github.scm (updated-github-url): Return the unchanged sourc= e URI > for packages using git-fetch. > [updated-url]: Do not handle URIs which end with ".git". LGTM, thanks! Ludo=E2=80=99. From unknown Fri Jun 20 19:52:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch. Resent-From: Eric Bavier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Jan 2019 14:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34097 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Arun Isaac , 34097@debbugs.gnu.org Received: via spool by 34097-submit@debbugs.gnu.org id=B34097.154764914315386 (code B ref 34097); Wed, 16 Jan 2019 14:33:02 +0000 Received: (at 34097) by debbugs.gnu.org; 16 Jan 2019 14:32:23 +0000 Received: from localhost ([127.0.0.1]:32888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjmEw-000406-MR for submit@debbugs.gnu.org; Wed, 16 Jan 2019 09:32:22 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:48126 helo=smtp.centurylink.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjmEu-0003zi-TY for 34097@debbugs.gnu.org; Wed, 16 Jan 2019 09:32:21 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1547649134; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=PNWAiP404DokNqBxu6iL1/y21BQ=; b=qNNHNdQz4jKv7iogNbPgGbRAZNZPbXWbhWORlPOH4FDxDiBXMWHpwB0XLIczkytA qnw9TTRqY4LwtJNZsJ/I2X9puV/5d8wQzyvo6++xwwd4YFstUaLkP9EzHSfdqFxS K2Jls1tBLuIAYFpCrUSWgXQy2OmY5uBdN388gxV7cHM2raoo/81GEaHAQ1X73E5p 6JaDWTlikTxpmg6McOj+laFTL9xJ6ZQkdPfYmoFSUHqK/qCWyeuhPEUaemooiyFZ qSDMK1JK2V9SBhUh/olEvIjmybw/FdGZFEA8ZbjgpTWx603/wUFyKuHB48nGLEr0 I/pOdcgDXAXsui8kwRBvgg==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.3 cv=fMFHIqSe c=1 sm=1 tr=0 a=SYCIrikDCkrhM095wVsMtQ==:117 a=SYCIrikDCkrhM095wVsMtQ==:17 a=KGjhK52YXX0A:10 a=3JhidrIBZZsA:10 a=zSv6zi-ZgakA:10 a=mDV3o1hIAAAA:8 a=4-abxAbMAAAA:8 a=tpEua92p0a2qtKNkadEA:9 a=QEXdDO2ut3YA:10 a=nuX1d5P-2dbjnA7sF0oA:9 a=_FVE-zBwftR9WsbkzFJk:22 a=KQxUoim3S31wEd9kAuKI:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp01.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.111.197] ([97.116.111.197:58226] helo=localhost) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=AES256-GCM-SHA384) id 9A/B4-01164-E604F3C5; Wed, 16 Jan 2019 09:32:14 -0500 Date: Wed, 16 Jan 2019 08:32:05 -0600 From: Eric Bavier Message-ID: <20190116083205.2da5045e@centurylink.net> In-Reply-To: <878szkx4in.fsf@gnu.org> References: <878szkx4in.fsf@gnu.org> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/30/NAt9n1q7w4hao.PXHi0v"; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/30/NAt9n1q7w4hao.PXHi0v Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Wed, 16 Jan 2019 11:48:00 +0100 Ludovic Court=C3=A8s wrote: > Hi, >=20 > Arun Isaac skribis: >=20 > > During `guix refresh PACKAGE`, the source URI for packages using > > git-fetch need not be updated. It can be returned unchanged, as it > > is. The attached patch does that. > > > > As a side issue, without this patch, git-fetch packages that do not have > > a source URI ending in ".git" are not updated correctly using `guix > > refresh PACKAGE`. See the package emacs-evil for an example. > > > > From f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001 > > From: Arun Isaac > > Date: Wed, 16 Jan 2019 15:21:06 +0530 > > Subject: [PATCH] import: github: Do not update URI for packages using > > git-fetch. > > > > * guix/import/github.scm (updated-github-url): Return the unchanged sou= rce URI > > for packages using git-fetch. > > [updated-url]: Do not handle URIs which end with ".git". =20 >=20 > LGTM, thanks! LGTM too. I had considered something similar when I first patched the updater for git-fetch, but hadn't found an example where it was needed (e.g. "emacs-evil"). Thanks! `~Eric --Sig_/30/NAt9n1q7w4hao.PXHi0v Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlw/QGUACgkQ/XPKxxnT JWaRaw/+JxRMwR6Gv37lRRM3wgRtymYb2mB08QQ+XaOPB0hIce8nn5T8S+M91jMO Ilnma9c2QdpgKKtfUYqhfx1QVNMGHzy/fl/01n9zyXbI42WQFYUBfpErik5AE3cd IZfyeJoYnb9LJ4wEYVBcQdExhEbRREcwPBUSblqp1O8e4UvQyXOXE4fPqu+eSgm+ CUBk841Vz7TA0m1ru9rHT3Es5cBnqQWpBfNbkfhjLzrpSsOAHRTWrO4dxSIVOsa/ EiLDl1srNzyjLJGcJKbx6o/1s5zWzT09Z1k5rJYDdeuI/8rHaogLrNGUP+FVJX7A QSGN696Thbr9Xe3h0y77Jigspih6+6xperT1MvlQBdmjnK6rprJTYdXj7zcu76Ra +RNvL7kfQKqtgqbRPX+Y77KPrEsJmnRdB/HIGCeGckVKQEVXIR7PhGUQsOVoVpJE KSbAanoTs0E8m+s5Ll1IHVJyVZ/Yai0+dfgqRvurecHJh+UNeKbFwJXahI7ne+yT UVz5pxLjgjb1Nw5FEss9unVddao7pAt+lDEvT2VAbc20B3x04MqOsEsjS++ZwdEb w54Cs5Tc15X+snbi+AM67VKgZKPXjOsVmGf/DFnMDOQkA47Fwi1zgCwz90/3gOxK boTA4xhtIdKN7AxUukoqdWDXoGAsa2KqD0v1+mlz07QXJVGBYJg= =t9kf -----END PGP SIGNATURE----- --Sig_/30/NAt9n1q7w4hao.PXHi0v-- From unknown Fri Jun 20 19:52:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Arun Isaac Subject: bug#34097: closed (Re: [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch.) Message-ID: References: X-Gnu-PR-Message: they-closed 34097 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 34097@debbugs.gnu.org Date: Wed, 16 Jan 2019 16:23:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1547655782-29223-1" This is a multi-part message in MIME format... ------------=_1547655782-29223-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #34097: [PATCH] import: github: Do not update URI for packages using git-fe= tch. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 34097@debbugs.gnu.org. --=20 34097: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D34097 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1547655782-29223-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 34097-done) by debbugs.gnu.org; 16 Jan 2019 16:22:13 +0000 Received: from localhost ([127.0.0.1]:33797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjnxF-0007aG-04 for submit@debbugs.gnu.org; Wed, 16 Jan 2019 11:22:13 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:56670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjnxD-0007a8-4A for 34097-done@debbugs.gnu.org; Wed, 16 Jan 2019 11:22:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding: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=L6nqueRoa68IfmB6N6mLjxciQZq/9XgFBeVtfFCLnTw=; b=Hb+lgFhx0TK4hicIGOw/y9szV JwiwY+zQymMt/3DS36pum2pvvZidcYKuRHakQWqY8MGKgAIuzzxYReFsR57ccuYJ5JUv+TJg2sleU mypwSF82CMbaHKMMezEpL6yBLZRUY+5ekWwuQDcr4xBfVvefAiXj6m19Qp3Lws0ozJ4Ts=; Received: from [103.5.134.173] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gjnx8-0004sy-4x; Wed, 16 Jan 2019 21:52:07 +0530 From: Arun Isaac To: Eric Bavier , Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= Subject: Re: [bug#34097] [PATCH] import: github: Do not update URI for packages using git-fetch. In-Reply-To: <20190116083205.2da5045e@centurylink.net> References: <878szkx4in.fsf@gnu.org> <20190116083205.2da5045e@centurylink.net> Date: Wed, 16 Jan 2019 21:51:42 +0530 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Pushed! Thank you both for the review. Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [103.5.134.173 listed in dnsbl.sorbs.net] X-Debbugs-Envelope-To: 34097-done Cc: 34097-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) --=-=-= Content-Type: text/plain Pushed! Thank you both for the review. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAlw/WhYACgkQLiXui2GA K7OZNAf+N4PAVPL+nfquf1xsKHMUTkC+p+O8mk5qsUvyp+01GWJ96knCSXbxl8AN 4sf/6NCbGCHYM4fi7nQPFKoR9UCdKwCPHXS5hRCDcm1to1UybQIix2skQh1ADGjR VbjqAE3+a1Ti6mLBb8J1ZFd//oLuyALCkbA7g0pE0ErXUFMocV0TVJfsgXTxzIRp 24MhxOoUTWOffvHRW2T3SdfkNlLauN3YZsR5r74OW5SWjDDWfHNZKvM5sDOfDxE6 q5QzXc35balVSAyvGXQ3ApTP9x0wL/502UZarSFIbtOVyf+L8OWcb8sF0v4llijl dVUZjaAmY6fuh7WMXlctQayvQC1rPQ== =TVCQ -----END PGP SIGNATURE----- --=-=-=-- ------------=_1547655782-29223-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Jan 2019 10:13:42 +0000 Received: from localhost ([127.0.0.1]:60680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjiCb-0007L9-RN for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gjiCa-0007Kw-0I for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:43220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjiCU-0000y9-Jq for submit@debbugs.gnu.org; Wed, 16 Jan 2019 05:13:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjiCR-0004sN-Hk for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:34 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjiCQ-0000Oy-2s for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:31 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:50962) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjiCP-0008Bc-HH for guix-patches@gnu.org; Wed, 16 Jan 2019 05:13:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: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=0jisTuCJkFgEgTElvV0KayzIvrtOsi48UU0JfYACpfc=; b=Y0lrpaOZm8kxcktzELd2Wcx8KC Gr4GopIbaCyPRfmi6IkGMN46f4LUAPMqHaqGtQ5VP6A/S9AxU4xYCyeL6giuZKVk3t09I/jx5VsG6 a0xQzAroOUd0/sxFTnpsHA71sE7bJcrU6QU9NoiWjBzim/S6ON8vp2SPC8YsHc9iIhR4=; Received: from [14.139.128.10] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gjiCI-0002XH-2S; Wed, 16 Jan 2019 15:43:23 +0530 From: Arun Isaac To: guix-patches@gnu.org Subject: [PATCH] import: github: Do not update URI for packages using git-fetch. Date: Wed, 16 Jan 2019 15:43:09 +0530 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.77.148.100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Eric Bavier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain During `guix refresh PACKAGE`, the source URI for packages using git-fetch need not be updated. It can be returned unchanged, as it is. The attached patch does that. As a side issue, without this patch, git-fetch packages that do not have a source URI ending in ".git" are not updated correctly using `guix refresh PACKAGE`. See the package emacs-evil for an example. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-import-github-Do-not-update-URI-for-packages-using-g.patch Content-Transfer-Encoding: quoted-printable From=20f63bf518395a06dd0c947222e177a66e59c59e96 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 16 Jan 2019 15:21:06 +0530 Subject: [PATCH] import: github: Do not update URI for packages using git-fetch. * guix/import/github.scm (updated-github-url): Return the unchanged source = URI for packages using git-fetch. [updated-url]: Do not handle URIs which end with ".git". =2D-- guix/import/github.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/github.scm b/guix/import/github.scm index ad662e7b02..b287313d98 100644 =2D-- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2016 Ben Woodcroft ;;; Copyright =C2=A9 2017, 2018 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2018 Eric Bavier +;;; Copyright =C2=A9 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,7 +55,6 @@ false if none is recognized" (github-user-slash-repository url))) (repo (github-repository url))) (cond =2D ((string-suffix? ".git" url) url) ((string-suffix? (string-append "/tarball/v" version) url) (string-append prefix "/tarball/v" new-version)) ((string-suffix? (string-append "/tarball/" version) url) @@ -99,7 +99,7 @@ false if none is recognized" ((source-uri ...) (find updated-url source-uri)))) ((eq? fetch-method download:git-fetch) =2D (updated-url (download:git-reference-url source-uri))) + (download:git-reference-url source-uri)) (else #f)))) =20 (define (github-package? package) =2D-=20 2.19.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAlw/A7YACgkQLiXui2GA K7PO5wf/diiA1PeSgODbRhxpr7EdeDNmnU5h0kN8AgdHDulw4FSCXmBreqHv6vJz MO3+DrOnHtsj7qDOf1PE3liRySdDOHUAxn0Ya9neJxWvoAMMir/GvJJjKuszpu2H p/iUrsKsBEdfdUKQf34Sn34nnUf8nxPjfowEL/bxMru2+SjvkVhVJwF2xtWIUH/4 e67OP0h37KWt6sQdEQCv5zrcDeSE7utcYfpibw3e+ZgBoiMrknt+U5lMzkfMhm/f XJM35EAFP+q4hZDv4aFPTvKRXHSr6nqhgv/lQqWOYSU2lQp5yB094tDDyiAU9l54 WdQjmm4/T0cBoWc5WuguM4DPyVgJoA== =bn0r -----END PGP SIGNATURE----- --==-=-=-- ------------=_1547655782-29223-1--