From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 16 05:04:45 2019 Received: (at submit) by debbugs.gnu.org; 16 Jun 2019 09:04:45 +0000 Received: from localhost ([127.0.0.1]:39691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcR5h-0008Un-Df for submit@debbugs.gnu.org; Sun, 16 Jun 2019 05:04:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:59574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcR5g-0008Ug-81 for submit@debbugs.gnu.org; Sun, 16 Jun 2019 05:04:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36023) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcR5c-0006Li-SQ for bug-guix@gnu.org; Sun, 16 Jun 2019 05:04:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcR5Z-0004u7-5S for bug-guix@gnu.org; Sun, 16 Jun 2019 05:04:39 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51597) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcR5V-0004oX-JX for bug-guix@gnu.org; Sun, 16 Jun 2019 05:04:33 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 086E22208C for ; Sun, 16 Jun 2019 05:04:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 16 Jun 2019 05:04:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version:content-type; s= fm3; bh=/N3IocKE8TWmx3wPOcHYH9KkyquN0T4vylSDME42iwo=; b=K8NrSErn YXBA/qGB8oIoLlgunmX7Sd8qL0L7qKyDPlnh3zVX/4RUpjoNuIWgSMFlKjKT0UJ5 gXX5tFWr3HFB7loNoKyTjIayZcgxgXnEFpoUC82FpGDm5ZV1thJiQU4hcnJHEJFV jmVFi6muR/tmFh2ZYAFZHeSA/kaD0Hc0m3iQ4HBQDO63dDro1Rb7dyk6kiM2gqux 9kTv8+6X640LX6rOWnj4+ztEhZWfTnTwmz8/G6LHfQBq2DeN1CZtGdbvPCtSCCjL dMwdoIzOiIuYpfOFzK6Fnyb2Q882JL+v1lkkHylS8C6qVShGC4C2oYez10XRhrfT E6y2GDheMBGlIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=/N3IocKE8TWmx3wPOcHYH9KkyquN0 T4vylSDME42iwo=; b=d9sM6l4W4354RcrlCRFAkA08U6os15bZaoafnzWpRlGRl yyeG8Bai4R+wikIu1u1QWIu6/2CcmzefX7r4w9OquARPrua6d9uCX0PUS0Rj0gpP s9uCte8qfzblv3T+1CfdLvlw+P9SPSMJyrB+2DZC+mfwwrMURvApWXscP/vdpdsG coDwKgTd2WEaLNV5GMPcmTdNE/XDAoTf10WwP83LPrCiV1L2IhmsbSE1NyH6yzE9 KJKuV53X8uFCmIWTScw8rXN+yT1HIfvltV96h5K1rlsWoB78CoQg6UkC43vxI9tK qbuWc0HqqUl8jonHym4GmkeJtWMrMg7dtXHo4aAZg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrudeihedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufgffkfggtgesghdtreertd ertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhm rghilhdrtghomheqnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgv rhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 64CB78005A for ; Sun, 16 Jun 2019 05:04:28 -0400 (EDT) From: Marius Bakke To: bug-guix@gnu.org Subject: Repacked source checkouts get a misleading file name User-Agent: Notmuch/0.29 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Sun, 16 Jun 2019 11:04:26 +0200 Message-ID: <874l4p52at.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.25 X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit 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: -2.6 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, When repacking a source checkout (e.g. by using git-fetch with a snippet), the generated file name contains only the first two version identifiers. E.g. `guix build -S eudev` returns /gnu/store/7lgsxmr0rk9f8fbq6k0kj1aqb7lnrlll-eudev-3.2.tar.xz ...even though it should be "3.2.8". This patch fixes it: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-packages-Keep-full-version-in-file-name-when-repacki.patch Content-Transfer-Encoding: quoted-printable From=200c44561d0d45de91f4674d659b86d740642ae801 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 10:50:15 +0200 Subject: [PATCH] packages: Keep full version in file name when repacking source checkouts. * guix/packages.scm (patch-and-repack): If ORIGINAL-FILE-NAME is a source checkout, drop the '-checkout' part so the version-detecting code works. =2D-- guix/packages.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index c94a651f27..5b8969e079 100644 =2D-- a/guix/packages.scm +++ b/guix/packages.scm @@ -505,11 +505,17 @@ specifies modules in scope when evaluating SNIPPET." (and=3D> (file-extension file-name) (cut string-every char-set:hex-digit <>))) =20 + (define (checkout? directory) + ;; Return true if DIRECTORY is a checkout (git, svn, etc). + (string-suffix? "-checkout" directory)) + (define (tarxz-name file-name) ;; Return a '.tar.xz' file name based on FILE-NAME. =2D (let ((base (if (numeric-extension? file-name) =2D original-file-name =2D (file-sans-extension file-name)))) + (let ((base (cond ((numeric-extension? file-name) + original-file-name) + ((checkout? file-name) + (string-drop-right file-name 9)) + (else (file-sans-extension file-name))))) (string-append base (if (equal? (file-extension base) "tar") ".xz" =2D-=20 2.22.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0GBhoACgkQoqBt8qM6 VPpcNQgAoGxnhm3chqZU5peUbi5PDbTv0sQi6SJbEnHbctXsW5f8vC+brdwUBtIA X3Esz4mFSIBKtSTnhUSrec6q+fdqGonWYP5z4Lo1mXuApn/3sw1diopFbIFkw5mc UDntEq76IGohsWy1y0BZsPFCDF/wWf+0YyRHj5QMwE6pqlWqCtTtxH+7VwCBsVqG Rba10d97BxBS0zen5QsKPJXGR36PQ15cBD0hpb84mk0Iyf0owH2ZJXhQMVX/2P8S zIOIAWrxprsnrD3Y2UJVXCLtWVjyeKgHfti2DPoo6WwfjG0zUgB7GfR9nIZ8oK60 IsFa8r4NA4KHDBtrFwGz2ORPBlQiLQ== =cO3D -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 16 05:13:23 2019 Received: (at 36242) by debbugs.gnu.org; 16 Jun 2019 09:13:23 +0000 Received: from localhost ([127.0.0.1]:39698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcRE3-0000Hb-Ei for submit@debbugs.gnu.org; Sun, 16 Jun 2019 05:13:23 -0400 Received: from flashner.co.il ([178.62.234.194]:43948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcRE0-0000HM-Sc for 36242@debbugs.gnu.org; Sun, 16 Jun 2019 05:13:21 -0400 Received: from localhost (unknown [94.230.83.247]) by flashner.co.il (Postfix) with ESMTPSA id 20AE14009C; Sun, 16 Jun 2019 09:13:15 +0000 (UTC) Date: Sun, 16 Jun 2019 12:13:13 +0300 From: Efraim Flashner To: Marius Bakke Subject: Re: bug#36242: Repacked source checkouts get a misleading file name Message-ID: <20190616091313.GB1460@macbook41> References: <874l4p52at.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="mxv5cy4qt+RJ9ypb" Content-Disposition: inline In-Reply-To: <874l4p52at.fsf@devup.no> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 User-Agent: Mutt/1.12.0 (2019-05-25) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 36242 Cc: , mhw@netris.org, ludo@gnu.org, 36242@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: -1.0 (-) --mxv5cy4qt+RJ9ypb Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 16, 2019 at 11:04:26AM +0200, Marius Bakke wrote: > Hello, >=20 > When repacking a source checkout (e.g. by using git-fetch with a > snippet), the generated file name contains only the first two version > identifiers. >=20 > E.g. `guix build -S eudev` returns >=20 > /gnu/store/7lgsxmr0rk9f8fbq6k0kj1aqb7lnrlll-eudev-3.2.tar.xz >=20 > ...even though it should be "3.2.8". >=20 > This patch fixes it: >=20 > From 0c44561d0d45de91f4674d659b86d740642ae801 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Sun, 16 Jun 2019 10:50:15 +0200 > Subject: [PATCH] packages: Keep full version in file name when repacking > source checkouts. >=20 > * guix/packages.scm (patch-and-repack): If ORIGINAL-FILE-NAME is a source > checkout, drop the '-checkout' part so the version-detecting code works. > --- > guix/packages.scm | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) >=20 > diff --git a/guix/packages.scm b/guix/packages.scm > index c94a651f27..5b8969e079 100644 > --- a/guix/packages.scm > +++ b/guix/packages.scm > @@ -505,11 +505,17 @@ specifies modules in scope when evaluating SNIPPET." > (and=3D> (file-extension file-name) > (cut string-every char-set:hex-digit <>))) > =20 > + (define (checkout? directory) > + ;; Return true if DIRECTORY is a checkout (git, svn, etc). > + (string-suffix? "-checkout" directory)) > + > (define (tarxz-name file-name) > ;; Return a '.tar.xz' file name based on FILE-NAME. > - (let ((base (if (numeric-extension? file-name) > - original-file-name > - (file-sans-extension file-name)))) > + (let ((base (cond ((numeric-extension? file-name) > + original-file-name) > + ((checkout? file-name) > + (string-drop-right file-name 9)) > + (else (file-sans-extension file-name))))) > (string-append base > (if (equal? (file-extension base) "tar") > ".xz" > --=20 > 2.22.0 >=20 Pinging Mark and Ludo, similar to https://issues.guix.info/issue/34066 --=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 --mxv5cy4qt+RJ9ypb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl0GCCUACgkQQarn3Mo9 g1GxJxAAh8dst9Id3Uxwlc+D3tLB9FFoLeuj/Ps9WYv6MgtaENr2YeY9GYzAyu0/ QXce86By0gZ2zvidDt5x04fObCTPHOV39aa6xBxR4vRfKSaLsl5pJKAhh9SSLnC4 aM+mulw160PbcMp9QmjySdx3kO+8K1Y5DA/Tfeci6EEWQGP/xeHJP4D1NIBv/ZjN wcnt9uVqqVQ5JYT3TDMzE1rmypFfJwW6SLa2lwF8O1WJM8ItN65rLiPzkFhxh4Eu Wdbqzc000ns12ZZ5Lh3vLbS5vfWn88PMsXL+XTl66hu4jVjn4zm2F2WoqVUPTDWL 5VBMrK1jGEHjNWV0uR4p1MntqvxhbMR52qGOv0y/2iYsCEsK6oI5qzTe9hNqZzh4 SCPddAzcATdrb1Fs5ndGyuGE8+DbF36waG/jHbN8esRme08j3G3+gKJ9bSKRIeIV OPIGD4B3MByIfscq1j0UaA8gzSw3oiJbNDJ++YzJtdUVR9iXiHm8Xu8yP+wD9NW/ KjAtxNxx6sJZIS3DwNGg3Mm0rQ6wqzzQ5aBwn44DkQ4DUlO2F4tF1AeVvv4vVetE tokvBYeIUKxHmhKxaHaqyuoHLjYd/eE99NVsSAFGtWMmdHRB40E7DRjpbQytEsPT NS1WeQf7w56TCbaGpRGzxlmEjoCvLlDUvnNN+IYfS7eos26MEUE= =MclS -----END PGP SIGNATURE----- --mxv5cy4qt+RJ9ypb-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 16 05:24:13 2019 Received: (at 36242-done) by debbugs.gnu.org; 16 Jun 2019 09:24:13 +0000 Received: from localhost ([127.0.0.1]:39708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcROW-0000ZF-JT for submit@debbugs.gnu.org; Sun, 16 Jun 2019 05:24:12 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:60003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hcROU-0000Z0-UV for 36242-done@debbugs.gnu.org; Sun, 16 Jun 2019 05:24:11 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D448921D2B; Sun, 16 Jun 2019 05:24:05 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 16 Jun 2019 05:24:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=J0KXozGpP+qb84+WvQGySFgAPP a1kj24mV3iw1suPao=; b=yvZCxOyzufOfTX4T6tr6Q//YnPmAse5g5Li3kdAQ5g 5iTEltrjYyQ8NyFZjpMu0vJ0cRdZCBL4r0b5Vx0A7C/MgIuTCu7b6+dQ6l+rrvvi wbGTj2Us2OIchieBD48VAmQcLgoUl5eWB3Kuxm/WF7Tu8Ok1x5FQ6nqKpA6TPGHa S2IV5Wju/2p1u4DbgEWAvDF2Ckqxw0KxpGLURqJotzGQdlw8i+Lbgl7/QIvi45l/ zoE0tde8Rx8/9Enr8m6RhXh8tDqRs/WlZ6wW9dS2hcGiFlXNNfgNmrDLQiu4CK9n evGHi0K5/eC1R2z9gShGlEOTi8W76Ha+6QPKa0CAzdNQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=J0KXoz GpP+qb84+WvQGySFgAPPa1kj24mV3iw1suPao=; b=iZ9zusrDbECONVc07hQ4Nk Uqc/uKIEHm5fVhwNlEvqFKMLUzhevJIFiiXQFjBgTl7lJb2fRg6aF65TIMufRhSw T6EpR4LzBGaHsXvrLb4VxYE0XH0thMYo5RbG+Bk8WYtG+VWv8qr6e8J0rWzEPovo g99xlAKPYXX2Aj+ogw9E7+yL5cd1Tc18Kmg7Yc4K1meLo6/GXxpJXnWAmOHK0NAk ZXZGS19WbpYtWBZGljXCh9z5KJRkRd2XyWVzCY3FW9mrSJTtZb24jYTSF4+lB1CU 9nJaqeNawTOFMKauundWSajWwqrBxO8slbs0rQV5/4wSBOM62BKc1kgGEwDCieEg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrudeihedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucffohhmrg hinhepghhuihigrdhinhhfohenucfkphepiedvrdduiedrvddviedrudegtdenucfrrghr rghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomhenucevlh hushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id D2FEC380084; Sun, 16 Jun 2019 05:24:04 -0400 (EDT) From: Marius Bakke To: Efraim Flashner Subject: Re: bug#36242: Repacked source checkouts get a misleading file name In-Reply-To: <20190616091313.GB1460@macbook41> References: <874l4p52at.fsf@devup.no> <20190616091313.GB1460@macbook41> User-Agent: Notmuch/0.29 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Sun, 16 Jun 2019 11:24:03 +0200 Message-ID: <87v9x53mto.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36242-done Cc: mhw@netris.org, ludo@gnu.org, 36242-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: -1.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Efraim Flashner writes: > On Sun, Jun 16, 2019 at 11:04:26AM +0200, Marius Bakke wrote: >> Hello, >>=20 >> When repacking a source checkout (e.g. by using git-fetch with a >> snippet), the generated file name contains only the first two version >> identifiers. >>=20 >> E.g. `guix build -S eudev` returns >>=20 >> /gnu/store/7lgsxmr0rk9f8fbq6k0kj1aqb7lnrlll-eudev-3.2.tar.xz >>=20 >> ...even though it should be "3.2.8". >>=20 >> This patch fixes it: >>=20 > >> From 0c44561d0d45de91f4674d659b86d740642ae801 Mon Sep 17 00:00:00 2001 >> From: Marius Bakke >> Date: Sun, 16 Jun 2019 10:50:15 +0200 >> Subject: [PATCH] packages: Keep full version in file name when repacking >> source checkouts. >>=20 >> * guix/packages.scm (patch-and-repack): If ORIGINAL-FILE-NAME is a source >> checkout, drop the '-checkout' part so the version-detecting code works. >> --- >> guix/packages.scm | 12 +++++++++--- >> 1 file changed, 9 insertions(+), 3 deletions(-) >>=20 >> diff --git a/guix/packages.scm b/guix/packages.scm >> index c94a651f27..5b8969e079 100644 >> --- a/guix/packages.scm >> +++ b/guix/packages.scm >> @@ -505,11 +505,17 @@ specifies modules in scope when evaluating SNIPPET= ." >> (and=3D> (file-extension file-name) >> (cut string-every char-set:hex-digit <>))) >>=20=20 >> + (define (checkout? directory) >> + ;; Return true if DIRECTORY is a checkout (git, svn, etc). >> + (string-suffix? "-checkout" directory)) >> + >> (define (tarxz-name file-name) >> ;; Return a '.tar.xz' file name based on FILE-NAME. >> - (let ((base (if (numeric-extension? file-name) >> - original-file-name >> - (file-sans-extension file-name)))) >> + (let ((base (cond ((numeric-extension? file-name) >> + original-file-name) >> + ((checkout? file-name) >> + (string-drop-right file-name 9)) >> + (else (file-sans-extension file-name))))) >> (string-append base >> (if (equal? (file-extension base) "tar") >> ".xz" >> --=20 >> 2.22.0 >>=20 > > Pinging Mark and Ludo, similar to https://issues.guix.info/issue/34066 Whoops, was not aware of that report! Closing as duplicate. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0GCrMACgkQoqBt8qM6 VPrMRwf/YGW/LF9F4zgfv3RXV9Io6kSd6Qn+bz9ts0EoXVvLd/WgXi2qcTF75svH B1YEZ98XE3kmoOjOHLuOXrP3Xpo+O73XerWVeLlti7M1T3FH6BWy08Hz6GuaIes4 kVw7a8VvC9LPfPHhZgsZiS2RX/qLxcv7WX3G+qc3NkL6liEJvkT6T7bmVbe4fl35 7BXgp0YwLUWJdos/WH2D4K8qHWKniWWdWiOq8E3/kj+Ifl+QOSCkbyGrd56Am6Y3 zMdBYHo9HJWBnp3yBe4dFADLB+HdEfrdU000eBsLYvJQTfRH+N9AwmE9lQapbAhG QCSlGWoAafW9O30ZVLkyGMU1ARbwmw== =gmVs -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 17 05:40:23 2019 Received: (at 36242) by debbugs.gnu.org; 17 Jun 2019 09:40:24 +0000 Received: from localhost ([127.0.0.1]:41982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hco7j-000420-H4 for submit@debbugs.gnu.org; Mon, 17 Jun 2019 05:40:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49539) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hco7h-00041k-0d for 36242@debbugs.gnu.org; Mon, 17 Jun 2019 05:40:21 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hco7b-0001Oe-OY; Mon, 17 Jun 2019 05:40:15 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=55688 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hco7b-0007yl-3q; Mon, 17 Jun 2019 05:40:15 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Marius Bakke Subject: Re: bug#36242: Repacked source checkouts get a misleading file name References: <874l4p52at.fsf@devup.no> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 29 Prairial an 227 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 17 Jun 2019 11:40:13 +0200 In-Reply-To: <874l4p52at.fsf@devup.no> (Marius Bakke's message of "Sun, 16 Jun 2019 11:04:26 +0200") Message-ID: <874l4o1req.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 36242 Cc: 36242@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: -3.3 (---) Hello, Marius Bakke skribis: > From 0c44561d0d45de91f4674d659b86d740642ae801 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Sun, 16 Jun 2019 10:50:15 +0200 > Subject: [PATCH] packages: Keep full version in file name when repacking > source checkouts. > > * guix/packages.scm (patch-and-repack): If ORIGINAL-FILE-NAME is a source > checkout, drop the '-checkout' part so the version-detecting code works. LGTM! For =E2=80=98core-updates=E2=80=99, right? Thanks, Ludo=E2=80=99. From unknown Sun Jun 15 08:47:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 15 Jul 2019 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator