From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id IIwpL0QAlV9MFwAA0tVLHw (envelope-from ) for ; Sun, 25 Oct 2020 04:34:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wFLlKkQAlV8EGwAAB5/wlQ (envelope-from ) for ; Sun, 25 Oct 2020 04:34:12 +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 33FCB9402A0 for ; Sun, 25 Oct 2020 04:34:12 +0000 (UTC) Received: from localhost ([::1]:53068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWXjN-0000p0-D7 for larch@yhetil.org; Sun, 25 Oct 2020 00:34:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWXjG-0000of-4z for bug-guix@gnu.org; Sun, 25 Oct 2020 00:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWXjF-0006cw-R8 for bug-guix@gnu.org; Sun, 25 Oct 2020 00:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWXjF-0006nK-No for bug-guix@gnu.org; Sun, 25 Oct 2020 00:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43893: [PATCH v3] maint: update-guix-package: Prevent accidentally breaking guix pull. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 25 Oct 2020 04:34:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 43893-submit@debbugs.gnu.org id=B43893.160360038626054 (code B ref 43893); Sun, 25 Oct 2020 04:34:01 +0000 Received: (at 43893) by debbugs.gnu.org; 25 Oct 2020 04:33:06 +0000 Received: from localhost ([127.0.0.1]:35592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWXiM-0006m9-56 for submit@debbugs.gnu.org; Sun, 25 Oct 2020 00:33:06 -0400 Received: from mail-qv1-f42.google.com ([209.85.219.42]:40604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWXiJ-0006lf-Bw for 43893@debbugs.gnu.org; Sun, 25 Oct 2020 00:33:04 -0400 Received: by mail-qv1-f42.google.com with SMTP id 63so963473qva.7 for <43893@debbugs.gnu.org>; Sat, 24 Oct 2020 21:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=n4BGtEjesQQ3xbXkH7YgbLA4qWvYOl70RGfCia6vC64=; b=XSDkpZKlnYb6zkPvhW7593kCU6cHdY2nqEQOGwG0QgQeb/YmYN6CC2P1V66SGkHvyA wUDSEttBu8a9LAB612JnX9zNdzktFaTtpodRTOGTlJj4xZfE7bLx3ddvyW94105YASH+ I484qI10R2WSzYHsu8AFoHrWBivC+D32eF5SiLICw4eZjN+rsmRUeksar+jVpW41/Uf+ ebzwM9NqwA28UgFv/p4jRtY60bhPpvcRxWxV52/eM2N2fS3FidjH6q1SB4xnBsZ/+Mej S+u7CqtvjZ4PX0mIvYT28wl+FHW4UkHKZ1Nh4D1dl8eL2jFIhiSuEP0ylW0Bt+zpQbdr vOag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=n4BGtEjesQQ3xbXkH7YgbLA4qWvYOl70RGfCia6vC64=; b=dcTWudo2nsZWXArLGYjbBvRJ+lIb1lnMt3X+gtyIabv+QO4ytqtI1RzuFyKnUwNajl 76ONGjEzuHNpnpp8AsaJabmM5pd08pGI1Io23Cwr/hYa9Hbm7Z+alf0uXmefYzyVpvWD 44ZjhyLu+jT4IRNJriDpgJuN4VZC3M5h5dON4+UnpGy+iqT+cnUprZNh5ieMSxUZlQvg a7BhM3iR6JtjC0aWsllMfhieH+cyup5eS9pZPkP9ydohVEE4UYGFA6Z5mQjdO7sHgkom vRK3HEELs/S9/oIi15GZ1SJENoevWHr1++2IZq0+l9jAt9mG9GhlC66BpcwNSQ9XRiRa lYfA== X-Gm-Message-State: AOAM532kxWUiiEzT8FAIXhAUjqhoWsE8dDJhCppbxGRlywI2v1sEAWBG 3b7KyX2vZzK/iYl/9uWEZKs= X-Google-Smtp-Source: ABdhPJw3e/8kkg7NIxR4HfYw3n6zViCBcgyLQFPwQQ2tpwXrl9lbVSwqd9MpuoMgKbpwxm56ntxy5g== X-Received: by 2002:a0c:ecce:: with SMTP id o14mr1989961qvq.2.1603600377777; Sat, 24 Oct 2020 21:32:57 -0700 (PDT) Received: from hurd (dsl-159-173.b2b2c.ca. [66.158.159.173]) by smtp.gmail.com with ESMTPSA id 79sm4023549qkl.42.2020.10.24.21.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 21:32:57 -0700 (PDT) From: Maxim Cournoyer 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> Date: Sun, 25 Oct 2020 00:32:56 -0400 In-Reply-To: <87k0vhm1fg.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Fri, 23 Oct 2020 17:01:23 +0200") Message-ID: <87d0172adj.fsf@gmail.com> 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: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=XSDkpZKl; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: 0.09 X-TUID: QvlfYgC54QrT Hi Ludovic, 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 ups= tream. Aborting. >> make: *** [Makefile:6507: update-guix-package] Error 1 > > I agree that the better diagnostic is nice. Though it=E2=80=99s a script= 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 enou= gh > (myself included, by not commenting early and accurately). I=E2=80=99m a= lso 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"; 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 :-). It seems we'll have to disagree on this one; but as you said, it's a tiny part of the bigger landscape! >>> BTW, in =E2=80=98make release=E2=80=99 does =E2=80=98make update-guix-p= ackage=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. 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 'di= stdir-am'. Stop. make[3]: Leaving directory '/home/maxim/src/guix' make[2]: *** [Makefile:5521: distdir] Error 2 make[2]: Leaving directory '/home/maxim/src/guix' make[1]: *** [Makefile:5630: dist] Error 2 make[1]: Leaving directory '/home/maxim/src/guix' make: *** [Makefile:6410: dist-with-updated-version] Error 2 Can you reproduce this problem? Thank you, Maxim