From patchwork Thu May 25 16:07:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 50321 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9EB7627BBE9; Thu, 25 May 2023 17:09:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E47427BBE2 for ; Thu, 25 May 2023 17:09:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2DWS-0008OM-GT; Thu, 25 May 2023 12:09:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2DWQ-0008KK-Sd for guix-patches@gnu.org; Thu, 25 May 2023 12:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2DWQ-0003Ky-Kx for guix-patches@gnu.org; Thu, 25 May 2023 12:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2DWQ-00022b-G1 for guix-patches@gnu.org; Thu, 25 May 2023 12:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63647] [PATCH v3 2/3] guix: import: go: Catch Git error. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 May 2023 16:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63647@debbugs.gnu.org Cc: Felix Lechner , Simon Tournier Received: via spool by 63647-submit@debbugs.gnu.org id=B63647.16850308877761 (code B ref 63647); Thu, 25 May 2023 16:09:02 +0000 Received: (at 63647) by debbugs.gnu.org; 25 May 2023 16:08:07 +0000 Received: from localhost ([127.0.0.1]:47929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2DVX-000216-08 for submit@debbugs.gnu.org; Thu, 25 May 2023 12:08:07 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:38023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2DVT-00020G-0H for 63647@debbugs.gnu.org; Thu, 25 May 2023 12:08:05 -0400 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3f3284dff6cso5627645e9.0 for <63647@debbugs.gnu.org>; Thu, 25 May 2023 09:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685030877; x=1687622877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CSnHPMzezOPOSZyv6KXp9jZFfx9VEwTPOCtQsJi6uGA=; b=BA8tig6pGtLxb0b6O8CnyHjZF+2Xu9OdRIw5mJc3UghGIVJC7nrcOsbPMpXds/Dh8c walIwaPc9c96a2JXNjFqeQvciNrVrBT/Hj8gsevWPs7qEhpwjzo5W5d59XkGsOWBFH/x xLHUCFN9qWVWl9ZJ4VXJPbb5yY6esVtpS/2rcLckIPCJ5daDj9fjE4VVkouf0eakHO0w jMUa6I1FzAXno68ZgZchLCraeerZLpZRXXfwlXVFdF1Dvp28OmACBA/exiuXYikOD/lp 5+7pgqr7GnGaP5edB8t9gbdBfZz51IB89YgAKd9jd0bTVhe42g3UB7T89sEEdm8Bmg6r OCsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685030877; x=1687622877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CSnHPMzezOPOSZyv6KXp9jZFfx9VEwTPOCtQsJi6uGA=; b=jvmAyufOwxBW1qsTYbi9VfjgIeEL8wMfzAXTQXyEktHz+2qhEBShzSQB1Ih26ePknU 9q6hinaln/o2yKWehFfJiy21QiHwrvDe6OEjf+WFi+HfAMC3gaU2z4hBYjQaXJLe1i4B TQLpTL1pZ3gkawXY2NXplre2bzytCukynXiyt27FbsTOmqUU2HAGDTRgDfRXwKXjB1g9 8Op9Zr8U48TojLYq7e4XKps+AhCx34Pm7b4LkoK5DkN6SdhcYJt4D/jPhqzjfDOWvlcz 9topyuRnXQYp+UrwILsi4Qn500q35+vEl/anWuhILOis6ghyjyv01T2jZSL3WtS4aFtd nzsw== X-Gm-Message-State: AC+VfDxssCwOAnpsYWzuQw9n4NEI5ky14PkdCAtdyYC7+bhSGLNFdsAb +K3bfXrAuiF6eK+fHT51W3snFiDIZKc= X-Google-Smtp-Source: ACHHUZ6KZIyZiVmjNucfs1o7sULU76D++stJj3MwFz6VbeznpfSsH7Mx9J85r1ue6VsCbxaR6PGROg== X-Received: by 2002:a05:600c:214c:b0:3f6:602:97af with SMTP id v12-20020a05600c214c00b003f6060297afmr5208997wml.3.1685030876739; Thu, 25 May 2023 09:07:56 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id y9-20020a5d4709000000b00307d58b3da9sm2261016wrq.25.2023.05.25.09.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 09:07:56 -0700 (PDT) From: Simon Tournier Date: Thu, 25 May 2023 18:07:48 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/go.scm (git-checkout-hash): Catch Git error. Reported-by: Felix Lechner . --- guix/import/go.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index 1943869162..c6258296f6 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2021-2022 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Sarah Morgensen -;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021, 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,9 +36,11 @@ (define-module (guix import go) #:use-module (guix memoization) #:use-module (guix utils) #:autoload (htmlprag) (html->sxml) ;from Guile-Lib - #:autoload (guix base32) (bytevector->nix-base32-string) + #:autoload (guix base32) (bytevector->nix-base32-string nix-base32-string->bytevector) #:autoload (guix build utils) (mkdir-p) + #:autoload (guix ui) (warning) #:autoload (gcrypt hash) (hash-algorithm sha256) + #:autoload (git structs) (git-error-message) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 peg) @@ -507,12 +509,18 @@ (define* (git-checkout-hash url reference algorithm) ;; subsequent "guix import" invocations. (mkdir-p cache) (chmod cache #o700) - (let-values (((checkout commit _) - (parameterize ((%repository-cache-directory cache)) - (update-cached-checkout url - #:ref - `(tag-or-commit . ,reference))))) - (file-hash* checkout #:algorithm algorithm #:recursive? #true))) + (catch 'git-error + (lambda _ + (let-values (((checkout commit _) + (parameterize ((%repository-cache-directory cache)) + (update-cached-checkout url + #:ref + `(tag-or-commit . ,reference))))) + (file-hash* checkout #:algorithm algorithm #:recursive? #true))) + (lambda (key error . rest) + (warning (G_ "Git error: ~a in ~a~%") (git-error-message error) url) + (nix-base32-string->bytevector + "0000000000000000000000000000000000000000000000000000")))) (define (vcs->origin vcs-type vcs-repo-url version) "Generate the `origin' block of a package depending on what type of source