From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35895) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAIhp-0002NP-TU for guix-patches@gnu.org; Tue, 17 Sep 2019 15:00:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAIhn-00014D-Mi for guix-patches@gnu.org; Tue, 17 Sep 2019 15:00:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAIhm-00011U-Bp for guix-patches@gnu.org; Tue, 17 Sep 2019 15:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iAIhm-0003w2-40 for guix-patches@gnu.org; Tue, 17 Sep 2019 15:00:02 -0400 Subject: [bug#37442] [PATCH] import/github: Check for more version prefixes Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:35782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAIh6-0001lb-E8 for guix-patches@gnu.org; Tue, 17 Sep 2019 14:59:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAIh5-0000eo-9j for guix-patches@gnu.org; Tue, 17 Sep 2019 14:59:20 -0400 Received: from flashner.co.il ([178.62.234.194]:48702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iAIh5-0000d8-07 for guix-patches@gnu.org; Tue, 17 Sep 2019 14:59:19 -0400 Received: from localhost (unknown [188.120.128.191]) by flashner.co.il (Postfix) with ESMTPSA id AFE1F400CD for ; Tue, 17 Sep 2019 18:59:16 +0000 (UTC) Date: Tue, 17 Sep 2019 21:59:15 +0300 From: Efraim Flashner Message-ID: <20190917185915.GA6057@E5400> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="NMuMz9nt05w80d4+" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 37442@debbugs.gnu.org --NMuMz9nt05w80d4+ Content-Type: multipart/mixed; boundary="XsQoSWH+UP9D9v3l" Content-Disposition: inline --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 'guix refresh openjpeg' gnu/packages/image.scm:762:13: openjpeg would be upgraded from 2.3.1 to ers= ion.2.1 I checked the git repository, there are a number of tags reading 'version.2.1' or similar. This allows for version tags 'version2.1' or 'version-2.1' or 'version.2.1' or 'version=E2=86=922.1'. (still looking for= a repo to test the last one) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-import-github-Check-for-more-version-prefixes.patch" Content-Transfer-Encoding: quoted-printable =46rom 1d32a908d3bdbec89420b638791960e7535a5e90 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Tue, 17 Sep 2019 21:50:36 +0300 Subject: [PATCH] import/github: Check for more version prefixes. * guix/import/github.scm (latest-released-version): Allow the version string to begin with the word 'version'. --- guix/import/github.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix/import/github.scm b/guix/import/github.scm index 55ea00a111..df5f6ff32f 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2017, 2018, 2019 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2018 Eric Bavier ;;; Copyright =C2=A9 2019 Arun Isaac +;;; Copyright =C2=A9 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,7 +187,12 @@ the package e.g. 'bedtools2'. Return #f if there is n= o releases" (substring tag 0 (+ name-length 1)))) (substring tag (+ name-length 1))) ;; some tags start with a "v" e.g. "v0.25.0" + ;; or with the word "version" e.g. "version.2.1" ;; where some are just the version number + ((string-prefix? "version" tag) + (if (char-set-contains? char-set:digit (string-ref tag 7)) + (substring tag 7) + (substring tag 8))) ((string-prefix? "v" tag) (substring tag 1)) ;; Finally, reject tags that don't start with a digit: --=20 2.23.0 --XsQoSWH+UP9D9v3l-- --NMuMz9nt05w80d4+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl2BLQMACgkQQarn3Mo9 g1EoWBAAvxj5ysN/xspN8oQvWGJKSHC00lx9+LwyPtMSVjy7UTlqpr8PreOdkpja TPhd5inP0AZPRWnluxSWgsFLUL2DCQ/tMMAGRxvz5C4nJ2jscmIcOguk4pQb0vGO kpVnV8YbcDfk9z+utAKmuU8XqWxNTJ8C69bxkwo5C1Y9J/3ZnkYyZcMKwlpeBRws 4iiLmgwMDrvyAX+aOnxJxKG0DsEiPGMy06i8shBAWAtW5NpHRWRpqFxIlOAqFC7P MQrdXvOanRkVgoLUsWNMPk70ECBT8eJ960RhMgHAINNLvbmHKyCBs3Z3Wws1EWHG 6MAGWy2q/YSCcf2HyosgcN7+Z9RasD+E2nbL6uLdSdpVxwBupq4Gg6Tm4Al2vFWi gEu/evT3yTIMzUUvqhrtFm0OQAM++8DVTnQoVaBumHFn+qOsgCTjSF+jY3njfe3S phdp+aREOm/8yTFB1oL1jq1Z2ABlENI+QKRmYGvThK2DuJxo3iwiPe8L9I2kUHEc avR8ibFiyP7rX4iGyWFNIFOJ1+k8vLoP+SZ0SLF+qpzShQ1ELtnVXcpg3+R/6t/q sfBpYgGnWThnbqxTIzX+kH/RBSV7djNuSU7qXGjzQs6+fk9RAUBu6tK8rKtDhW4J zZAcQQ6t/VBgiPBIJHoUJ9RyBfSG+0us5OEYH6fFYSCRrOgRoF0= =koXf -----END PGP SIGNATURE----- --NMuMz9nt05w80d4+--