From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iMzEMYrxkl+LGAAA0tVLHw (envelope-from ) for ; Fri, 23 Oct 2020 15:06:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aHLkLIrxkl93KAAAbx9fmQ (envelope-from ) for ; Fri, 23 Oct 2020 15:06:50 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E071B9404CA for ; Fri, 23 Oct 2020 15:06:49 +0000 (UTC) Received: from localhost ([::1]:33580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVyeU-0001ht-1r for larch@yhetil.org; Fri, 23 Oct 2020 11:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVyZu-0007j6-RL for bug-guix@gnu.org; Fri, 23 Oct 2020 11:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVyZu-0006Mm-Hv for bug-guix@gnu.org; Fri, 23 Oct 2020 11:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVyZu-0002Mw-1y for bug-guix@gnu.org; Fri, 23 Oct 2020 11:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43893: [PATCH v3] maint: update-guix-package: Prevent accidentally breaking guix pull. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 23 Oct 2020 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43893 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Maxim Cournoyer Received: via spool by 43893-submit@debbugs.gnu.org id=B43893.16034652997956 (code B ref 43893); Fri, 23 Oct 2020 15:02:02 +0000 Received: (at 43893) by debbugs.gnu.org; 23 Oct 2020 15:01:39 +0000 Received: from localhost ([127.0.0.1]:58006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVyZW-00023l-5a for submit@debbugs.gnu.org; Fri, 23 Oct 2020 11:01:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVyZU-0001xD-BG for 43893@debbugs.gnu.org; Fri, 23 Oct 2020 11:01:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51241) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVyZO-0006Js-NZ; Fri, 23 Oct 2020 11:01:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56978 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kVyZK-0007gg-7M; Fri, 23 Oct 2020 11:01:27 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87imbedsko.fsf@gnu.org> <20201014031705.4516-1-maxim.cournoyer@gmail.com> <87lfg0bo9m.fsf@gnu.org> <87v9f44852.fsf@gmail.com> <875z749czt.fsf@gnu.org> <87eelpd0af.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 2 Brumaire an 229 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: Fri, 23 Oct 2020 17:01:23 +0200 In-Reply-To: <87eelpd0af.fsf@gmail.com> (Maxim Cournoyer's message of "Fri, 23 Oct 2020 00:38:32 -0400") Message-ID: <87k0vhm1fg.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.8 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.8 (--) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 43893@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: Md7XFL34cM2N Hi Maxim, Maxim Cournoyer skribis: > The original problem was about the updated Guix package containing a > faulty hash (due to being computed from a uncontrolled checkout that > could be dirty). The other concern about preventing the use of a not > yet published commit was added based on earlier feedback. > >> above. The trick at =E2=80=9CRe-add SOURCE=E2=80=9D is here precisely t= o prevent >> attempts to re-download, as the comment explains, and this is what has >> been causing these troubles. >> >> The advantages (to me) would have been simpler code, no shelling out to >> =E2=80=98git=E2=80=99, and no fiddling with files under $PWD. > > Less code would also mean poorer diagnostics: > > time ./pre-inst-env guix build guix -S > The following derivation will be built: > /gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-chec= kout.drv > building /gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13a= e-checkout.drv... > guile: warning: failed to install locale > environment variable `PATH' set to `/gnu/store/378zjf2kgajcfd7mfr98jn5xyc= 5wa3qv-gzip-1.10/bin:/gnu/store/sf3rbvb6iqcphgm1afbplcs72hsywg25-tar-1.32/b= in' > Initialized empty Git repository in /gnu/store/02da8jb3wzzi3bqvrl214gdg0k= kxmaf8-guix-1.1.0-31.07c13ae-checkout/.git/ > error: Server does not allow request for unadvertised object 07c13aeb5abb= 1a5bc3cabffb9b2212993a0d5a0e > Failed to do a shallow fetch; retrying a full fetch... > From https://git.savannah.gnu.org/git/guix > * [new branch] core-updates -> origin/core-updates > [...] > * [new tag] v1.1.0rc2 -> v1.1.0rc2 > fatal: reference is not a tree: 07c13aeb5abb1a5bc3cabffb9b2212993a0d5a0e > git-fetch: '/gnu/store/i5b1vv7qc6l2gi4xwa9mqzjy3shvgk30-git-minimal-2.28.= 0/bin/git checkout 07c13aeb5abb1a5bc3cabffb9b2212993a0d5a0e' failed with ex= it code 128 > Trying content-addressed mirror at berlin.guix.gnu.org... > Trying content-addressed mirror at berlin.guix.gnu.org... > Trying to download from Software Heritage... > builder for `/gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07= c13ae-checkout.drv' failed to produce output path `/gnu/store/02da8jb3wzzi3= bqvrl214gdg0kkxmaf8-guix-1.1.0-31.07c13ae-checkout' > build of /gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13a= e-checkout.drv failed > View build log at '/var/log/guix/drvs/zh/fchz831mncd2kyqmh5d2q0r2rpg57s-g= uix-1.1.0-31.07c13ae-checkout.drv.bz2'. > guix build: error: build of `/gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-= guix-1.1.0-31.07c13ae-checkout.drv' failed > > real 1m42.825s > user 0m2.191s > sys 0m0.189s > > This took nearly 2 minutes, fetching the full Guix git repo just to tell > me that *something* is not right. > > Currently, we have: > > time make update-guix-package > git rev-parse HEAD > 4893a1394e2eb8b97995b491f2f37ed85513a20f > ./pre-inst-env "/gnu/store/i7z4pfa0c22q0qkxyl7fy2nlp3w658yg-profile/bin/g= uile" \ > ./build-aux/update-guix-package.scm \ > "`git rev-parse HEAD`" > error: Commit 4893a1394e2eb8b97995b491f2f37ed85513a20f is not pushed upst= ream. Aborting. > make: *** [Makefile:6507: update-guix-package] Error 1 I agree that the better diagnostic is nice. Though it=E2=80=99s a script t= hat=E2=80=99s essentially for a handful of people, who can certainly cope with the ugly error. Anyway, I think we didn=E2=80=99t analyze the initial situation well enough (myself included, by not commenting early and accurately). I=E2=80=99m als= o not fond of the added complexity and the risk of surprises when we make the release, but OTOH, it=E2=80=99s no big deal in the big picture! >> BTW, in =E2=80=98make release=E2=80=99 does =E2=80=98make update-guix-pa= ckage=E2=80=99 and expects it to >> work with a not-pushed-yet commit. So it=E2=80=99s a case where we need >> GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=3Dyes. > > Ah, good point. I'd like to fix this, It=E2=80=99s mostly about setting this variable at the right place in Makefile.am. > but running 'make release', it fails on: > > make[3]: *** No rule to make target 'po/doc/guix-manual.pot', needed by > 'distdir-am'. Stop. > > What did I miss? Probably you need ./bootstrap to generate the POT files. Thanks, Ludo=E2=80=99.