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 +CagHZdekl9vHwAA0tVLHw (envelope-from ) for ; Fri, 23 Oct 2020 04:39:51 +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 wLbzF5dekl8LfwAAbx9fmQ (envelope-from ) for ; Fri, 23 Oct 2020 04:39:51 +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 CE82294051F for ; Fri, 23 Oct 2020 04:39:50 +0000 (UTC) Received: from localhost ([::1]:51352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVork-0002tI-1j for larch@yhetil.org; Fri, 23 Oct 2020 00:39:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVor0-0002t8-Rr for bug-guix@gnu.org; Fri, 23 Oct 2020 00:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVor0-0002Uz-IB for bug-guix@gnu.org; Fri, 23 Oct 2020 00:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVor0-0000Bs-F3 for bug-guix@gnu.org; Fri, 23 Oct 2020 00:39:02 -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: Fri, 23 Oct 2020 04:39: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 43893-submit@debbugs.gnu.org id=B43893.1603427926704 (code B ref 43893); Fri, 23 Oct 2020 04:39:02 +0000 Received: (at 43893) by debbugs.gnu.org; 23 Oct 2020 04:38:46 +0000 Received: from localhost ([127.0.0.1]:54435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVoqj-0000BI-Iv for submit@debbugs.gnu.org; Fri, 23 Oct 2020 00:38:45 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:32968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVoqe-0000B0-L0 for 43893@debbugs.gnu.org; Fri, 23 Oct 2020 00:38:44 -0400 Received: by mail-qk1-f193.google.com with SMTP id v200so72017qka.0 for <43893@debbugs.gnu.org>; Thu, 22 Oct 2020 21:38:40 -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=iArWl1bu3B0Wkbj3vmTlR94UY+FZC9gejw4Gcoi0uk0=; b=bJwxBWd2jgJXVatvQ7ocbO42+tiu6z8gm3MArMl2E1gP9doHd6oFNQaDsmb6ybDZak biZ2IDkKDveZEZBFAafpeoZYAxD8qnQZL4ME5Ka/Q7qUeYNvtvWyrIr7vGpxC/GfwT/V EESIfRe6J8SJmlcVS33+MQf1zUWgxR+tbDl5LMUvFdKNuqiogPafFM4t/6TktOV6pf5c NzsrP7CaequzsPL2urfsRQ6coiNMhJCUJAo0P1K92gc2F3lB2ZtnA+A/cZPTUw7b/Xja DjMYnjLhuzIC3dqD6aa8wJtQSalaaMfZdI5DEbIzgRIwEXKzVNnIaU7bbLTnTJMqcchn nWYg== 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=iArWl1bu3B0Wkbj3vmTlR94UY+FZC9gejw4Gcoi0uk0=; b=aGP+vAMLbBM00JBrEwlMrDZo2icqV2upYKcPEO+qIFgVHX52Q53fjyXkBC4kq7wyc3 CzBru3L7jfKrlAp7o9IoKTnm4mGpTArKkwZPncAIDTOIixB/5AqBzxiCIvPKZ2+5P8B4 n6HTe3/EHAtlMsIhpGr4yls60q5b99XZEMLYNR+Pfuui4p6S8Oxx5ESiIFvzvdcSIc+u /7Ff9BdymSblOZzAKNRwHqcVbS6EzfAnPTlm9j2MIiXYMkoSM62bkcYnN+tL7seidIuZ 3ZhL4HHjwJKendxS/XhBFq1DFJtMWQVYh+qh8m1Po68eM20PtPFyUldYbMtsKDhR+czZ aLVw== X-Gm-Message-State: AOAM530vw3Vqz1cfJafR+aS7YSg3nH43TlHYWfP487HDn5V63x4CNwzo VSpyd/H5a3C+IZ/bGI5YB2U= X-Google-Smtp-Source: ABdhPJyjhIWBdON0p1rVN7u+y2kRoOC4xAAGdpomfPmMm+N4+e4DeWEq48zVkMjZmB4JxqGYuFocGg== X-Received: by 2002:a05:620a:12ec:: with SMTP id f12mr567139qkl.176.1603427914784; Thu, 22 Oct 2020 21:38:34 -0700 (PDT) Received: from hurd (dsl-159-119.b2b2c.ca. [66.158.159.119]) by smtp.gmail.com with ESMTPSA id o14sm285852qto.16.2020.10.22.21.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 21:38:34 -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> Date: Fri, 23 Oct 2020 00:38:32 -0400 In-Reply-To: <875z749czt.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 21 Oct 2020 10:53:10 +0200") Message-ID: <87eelpd0af.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.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.5 (/) 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=bJwxBWd2; 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: 3CcMbNhMobFe Hi Ludovic, Ludovic Court=C3=A8s writes: > Hi, > > Maxim Cournoyer skribis: > >> Ludovic Court=C3=A8s writes: > [...] >> Sorry, I'm a bit lost. Are you suggesting that we should restore the >> code following the ;; Re-add SOURCE [...], but wrapped with unless to >> make it conditional to GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT being >> defined? That part depends on SOURCE, a store file name, which we don't >> have anymore since we no longer add the sources to the store to compute >> the hash. > > I=E2=80=99m saying that the solution to the initial problem (that if you = don=E2=80=99t > run =E2=80=98guix build guix -S --check=E2=80=99 you=E2=80=99re not sure = =E2=80=98guix=E2=80=99 is referring to > a valid upstream commit) 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 to= 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-checko= ut.drv building /gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-= checkout.drv... guile: warning: failed to install locale environment variable `PATH' set to `/gnu/store/378zjf2kgajcfd7mfr98jn5xyc5w= a3qv-gzip-1.10/bin:/gnu/store/sf3rbvb6iqcphgm1afbplcs72hsywg25-tar-1.32/bin' Initialized empty Git repository in /gnu/store/02da8jb3wzzi3bqvrl214gdg0kkx= maf8-guix-1.1.0-31.07c13ae-checkout/.git/ error: Server does not allow request for unadvertised object 07c13aeb5abb1a= 5bc3cabffb9b2212993a0d5a0e 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 exit= 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.07c1= 3ae-checkout.drv' failed to produce output path `/gnu/store/02da8jb3wzzi3bq= vrl214gdg0kkxmaf8-guix-1.1.0-31.07c13ae-checkout' build of /gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-guix-1.1.0-31.07c13ae-= checkout.drv failed View build log at '/var/log/guix/drvs/zh/fchz831mncd2kyqmh5d2q0r2rpg57s-gui= x-1.1.0-31.07c13ae-checkout.drv.bz2'. guix build: error: build of `/gnu/store/zhfchz831mncd2kyqmh5d2q0r2rpg57s-gu= ix-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/gui= le" \ ./build-aux/update-guix-package.scm \ "`git rev-parse HEAD`" error: Commit 4893a1394e2eb8b97995b491f2f37ed85513a20f is not pushed upstre= am. Aborting. make: *** [Makefile:6507: update-guix-package] Error 1 real 0m1.135s user 0m1.066s sys 0m0.199s > BTW, in =E2=80=98make release=E2=80=99 does =E2=80=98make update-guix-pac= kage=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, 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? Thank you! Maxim