From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Isaac Subject: bug#34144: guix import github crash Date: Mon, 21 Jan 2019 00:11:56 +0530 Message-ID: References: <20190120093206.GA15839@macbook41> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:44936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glI3j-0002lE-A2 for bug-guix@gnu.org; Sun, 20 Jan 2019 13:43:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glI3i-0001eK-DU for bug-guix@gnu.org; Sun, 20 Jan 2019 13:43:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39916) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1glI3i-0001e7-8t for bug-guix@gnu.org; Sun, 20 Jan 2019 13:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1glI3i-0001Dr-4g for bug-guix@gnu.org; Sun, 20 Jan 2019 13:43:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20190120093206.GA15839@macbook41> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Efraim Flashner Cc: 34144@debbugs.gnu.org, bavier@member.fsf.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain I've attached a patch addressing this issue. May I push it? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-import-github-Check-if-git-URIs-are-GitHub-URIs.patch Content-Transfer-Encoding: quoted-printable From=2057fa15ef15d1fdb0896ce139e1e02c459b285743 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 20 Jan 2019 22:18:32 +0530 Subject: [PATCH] import: github: Check if git URIs are GitHub URIs. This fixes a regression introduced in 9a5091d0c181453d0f31ce97f96a4e577a25e= 796 whereby packages with git origin URIs not hosted on GitHub would be wrongly detected as being covered under the github updater. Reported by Efraim Flashner . * guix/import/github.scm (updated-github-url): Check if git URIs are GitHub URIs. =2D-- guix/import/github.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/import/github.scm b/guix/import/github.scm index b287313d98..e17ef0b840 100644 =2D-- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -98,7 +98,9 @@ false if none is recognized" (updated-url source-uri)) ((source-uri ...) (find updated-url source-uri)))) =2D ((eq? fetch-method download:git-fetch) + ((and (eq? fetch-method download:git-fetch) + (string-prefix? "https://github.com/" + (download:git-reference-url source-uri))) (download:git-reference-url source-uri)) (else #f)))) =20 =2D-=20 2.19.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAlxEwPQACgkQLiXui2GA K7NPkwgAvhst7CrLMkius3OkY5XcZqhPVBr0B07nrtCbDO3+zAHywtWqV3Woy8Ln J8avuRRBmXpnoiI4pP+t4FN2+2xfqfKnZZwvsSHDw/3AvcTIWXYYEgMygMf/HHUk jrg9rhJBQn4I2eijSiQpehk3aOkNXDqGk7L0WdwnAnMR844LyIw4iZOWQNsx5dVu hJNb1WWhHFrIUJEpNTqHknlY2usaW81SOBiLx/sN9D51rhi0vby5Ztl/DGuieFsu uXrjAam9/Oxl3ojVCY1ieNx2HQDCG1MoGfsuXn7iQ583qH3YkTXpYO6X5YU17uJQ Px5RCGdPQO+KItbVn93SWlEdY+Ccpg== =IGMn -----END PGP SIGNATURE----- --==-=-=--