From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: bug#36242: Repacked source checkouts get a misleading file name Date: Sun, 16 Jun 2019 12:13:13 +0300 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" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:37633) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcREh-0007t4-Jr for bug-guix@gnu.org; Sun, 16 Jun 2019 05:14:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcREg-0005Kc-FH for bug-guix@gnu.org; Sun, 16 Jun 2019 05:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hcREg-0005Jk-Ai for bug-guix@gnu.org; Sun, 16 Jun 2019 05:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hcREg-0000Ig-3x for bug-guix@gnu.org; Sun, 16 Jun 2019 05:14:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Content-Disposition: inline In-Reply-To: <874l4p52at.fsf@devup.no> 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: Marius Bakke Cc: 36242@debbugs.gnu.org --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--