From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 25 10:50:34 2020 Received: (at 43893) by debbugs.gnu.org; 25 Oct 2020 14:50:34 +0000 Received: from localhost ([127.0.0.1]:37276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWhLu-0001mv-1m for submit@debbugs.gnu.org; Sun, 25 Oct 2020 10:50:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWhLr-0001mj-Ur for 43893@debbugs.gnu.org; Sun, 25 Oct 2020 10:50:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35393) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWhLm-0006lr-6W; Sun, 25 Oct 2020 10:50:26 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55048 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kWhLl-0002UJ-92; Sun, 25 Oct 2020 10:50:25 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: bug#43893: [PATCH v3] maint: update-guix-package: Prevent accidentally breaking guix pull. 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> <87k0vhm1fg.fsf@gnu.org> <87d0172adj.fsf@gmail.com> Date: Sun, 25 Oct 2020 15:50:24 +0100 In-Reply-To: <87d0172adj.fsf@gmail.com> (Maxim Cournoyer's message of "Sun, 25 Oct 2020 00:32:56 -0400") Message-ID: <87k0vefjgv.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: -2.3 (--) X-Debbugs-Envelope-To: 43893 Cc: 43893@debbugs.gnu.org, marius@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 (---) Hi Maxim, Maxim Cournoyer skribis: > Ludovic Court=C3=A8s writes: > > [...] > >>> Currently, we have: >>> >>> time make update-guix-package >>> git rev-parse HEAD >>> 4893a1394e2eb8b97995b491f2f37ed85513a20f >>> ./pre-inst-env "/gnu/store/i7z4pfa0c22q0qkxyl7fy2nlp3w658yg-profile/bin= /guile" \ >>> ./build-aux/update-guix-package.scm \ >>> "`git rev-parse HEAD`" >>> error: Commit 4893a1394e2eb8b97995b491f2f37ed85513a20f is not pushed up= stream. Aborting. >>> make: *** [Makefile:6507: update-guix-package] Error 1 >> >> I agree that the better diagnostic is nice. Though it=E2=80=99s a scrip= t that=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 eno= ugh >> (myself included, by not commenting early and accurately). I=E2=80=99m = also 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! > > I'm sorry but I don't agree with the "we didn't analyze the initial > situation well enough"; The reason I wrote that is that we had overlooked the fact that =E2=80=98update-guix-package=E2=80=99 purposefully allows non-upstream comm= its, and that=E2=80=99s what allows =E2=80=98make release=E2=80=99 to work. It didn=E2=80=99t occur to me at the time, but the simplest path would have= been to conditionalize the bit that makes it possible to refer to non-upstream commits. > if I had to think about the best way to solve this problem now, I'd > still choose the way that was chosen then, as it provides the best > guarantee against producing a broken Guix package, something that > happened a couple times in the past, judging from git log. About > complexity, I'd much rather the tool break on me than breaking 'guix > pull' for everyone :-). I agree that addressing this problem was in order. :-) The added complexity brings its own set of (less serious) issues though. >>>> BTW, in =E2=80=98make release=E2=80=99 does =E2=80=98make update-guix-= package=E2=80=99 and expects it to >>>> work with a not-pushed-yet commit. So it=E2=80=99s a case where we ne= ed >>>> GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=3Dyes. > > I want to be able to run 'make release' first to test this works > correctly, but even after rebuilding my source tree from scratch > (following a 'make distclean'), and also attempting 'make download-po', > and following release.org from guix-maintenance, I still get: > > make[3]: *** No rule to make target 'po/doc/guix-manual.pot', needed by '= distdir-am'. Stop. Oh my bad; the solution appears to be: make doc-pot-update Lemme know how it goes! Ludo=E2=80=99.