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 6CR6CqhOe18NQAAA0tVLHw (envelope-from ) for ; Mon, 05 Oct 2020 16:49:44 +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 KIozBqhOe1+GCQAAB5/wlQ (envelope-from ) for ; Mon, 05 Oct 2020 16:49:44 +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 A2D2A940390 for ; Mon, 5 Oct 2020 16:49:43 +0000 (UTC) Received: from localhost ([::1]:54368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPTgE-00027Q-Cv for larch@yhetil.org; Mon, 05 Oct 2020 12:49:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPTeb-000121-VX for guix-patches@gnu.org; Mon, 05 Oct 2020 12:48:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPTeb-00019X-Ku for guix-patches@gnu.org; Mon, 05 Oct 2020 12:48:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kPTeb-0005O9-I1 for guix-patches@gnu.org; Mon, 05 Oct 2020 12:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43817] [PATCH 2/2] guix: build: svn: Add 'guard' to handle error. References: <20201005163544.3947-1-zimon.toutoune@gmail.com> In-Reply-To: <20201005163544.3947-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Oct 2020 16:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43817 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43817@debbugs.gnu.org Cc: zimoun Received: via spool by 43817-submit@debbugs.gnu.org id=B43817.160191647020693 (code B ref 43817); Mon, 05 Oct 2020 16:48:01 +0000 Received: (at 43817) by debbugs.gnu.org; 5 Oct 2020 16:47:50 +0000 Received: from localhost ([127.0.0.1]:50381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPTeQ-0005Nh-6M for submit@debbugs.gnu.org; Mon, 05 Oct 2020 12:47:50 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPTeO-0005NV-H9 for 43817@debbugs.gnu.org; Mon, 05 Oct 2020 12:47:49 -0400 Received: by mail-wr1-f66.google.com with SMTP id o5so10371766wrn.13 for <43817@debbugs.gnu.org>; Mon, 05 Oct 2020 09:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=L1F3n7vmhnrqTeFrdwK2JNl4JFk3Lhc8t5wjnXZ7fsc=; b=R+FEjoU62x8DDiNEm5kLPew6YSW4vSpRYQMPwaw9Mf7SYVEOEnwZNAzG979NU30DDl pK0fvuoodKAzq+oRxeagArC7DcE0ClmieQz14cwDVfQz5lb1d2mpf2o030fwhqCfjiWP nrgAdylaqOpt+gLr2YIzGLzJN3JpgQZ0UmqFh1QtBOlVUMX69UrbKyi3K4XvdzIP0r6/ dHmkrdmuiGY8tWxtaesaYGTP9tTgm0BUBU/YWBrSICLl7ZZLowJUEYfvDAOn7HablbI+ xVwtB01mPSustqSAFqwlzIeBmUHdCSUJ09KtQCOjPBeYpid1Z33yyxew8q7Z6yKOW7E6 b7jA== 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:date:message-id:mime-version :content-transfer-encoding; bh=L1F3n7vmhnrqTeFrdwK2JNl4JFk3Lhc8t5wjnXZ7fsc=; b=WK/17bWQB3I5Z+64fsYUqAZTftH8MMLkGuns9fqiuHfz4QUtzJPkygrNUvl2O/43W+ Y6gFXKgaCdsI+P4gehN0SR1m566tG3NVoJ0vRUOvil4i2Y2XrDc7ai/ihY6tzEUBNEul ZkyPaSIzgPYdXRckwEug2kQQEwPWWHfU9+ZLyozwM/KU4VX8pr9zPgxUntvIqfYnfJjg jrgd9BIymXzucc128R2Ef9Crnh3gZbARERAVZevrmGJJU+hE1/5pNFwrH16ctLLnpm2Q PcBuEdZ7RhRm+RAoVYfBqR6fA3FGQBhLxnHSUUa9CG31BUZDLyDyRhgvDM9QKBWTpJt7 NPJg== X-Gm-Message-State: AOAM532ize3WG+sQiONtFMp7rMaQwUg4wqx3qDC2ZnHPmRF/XR8v6Lr9 vhvAc7kSbrpfYI1d/cbmd7bpnzgQZwjW4w== X-Google-Smtp-Source: ABdhPJyInZZVPhhMjm7gMV0gMvPS2fHo29ayBpOfRpCTWJYP88AeRtTzmu3UTtmqE2+olzH7/DHtKg== X-Received: by 2002:a5d:6412:: with SMTP id z18mr332856wru.30.1601916462221; Mon, 05 Oct 2020 09:47:42 -0700 (PDT) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id e18sm651232wrx.50.2020.10.05.09.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 09:47:41 -0700 (PDT) From: zimoun Date: Mon, 5 Oct 2020 18:47:39 +0200 Message-Id: <20201005164739.8826-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=R+FEjoU6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: 8itw/yaGf+yC * guix/build/svn.scm (svn-fetch): Add 'guard' to handle error. --- guix/build/svn.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/guix/build/svn.scm b/guix/build/svn.scm index 33783f3056..0afe887487 100644 --- a/guix/build/svn.scm +++ b/guix/build/svn.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,8 @@ (define-module (guix build svn) #:use-module (guix build utils) + #:use-module (srfi srfi-34) + #:use-module (ice-9 format) #:export (svn-fetch)) ;;; Commentary: @@ -36,7 +39,20 @@ (password #f)) "Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a valid Subversion revision. Return #t on success, #f otherwise." - (apply invoke svn-command + (mkdir-p directory) + + (guard (c ((invoke-error? c) + (format (current-error-port) + "svn-fetch: '~a~{ ~a~}' failed with exit code ~a~%" + (invoke-error-program c) + (invoke-error-arguments c) + (or (invoke-error-exit-status c) ;XXX: not quite accurate + (invoke-error-stop-signal c) + (invoke-error-term-signal c))) + (delete-file-recursively directory) + #f)) + (with-directory-excursion directory + (apply invoke svn-command "export" "--non-interactive" ;; Trust the server certificate. This is OK as we ;; verify the checksum later. This can be removed when @@ -50,6 +66,6 @@ valid Subversion revision. Return #t on success, #f otherwise." '() (list "--ignore-externals")) ,url ,directory)) - #t) + #t))) ;;; svn.scm ends here -- 2.28.0