From patchwork Mon May 31 22:44:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 29717 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 CAB4127BC78; Mon, 31 May 2021 23:45:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7203927BC81 for ; Mon, 31 May 2021 23:45:51 +0100 (BST) Received: from localhost ([::1]:51534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnqfO-00074R-IL for patchwork@mira.cbaines.net; Mon, 31 May 2021 18:45:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnqef-0006Fy-EL for guix-patches@gnu.org; Mon, 31 May 2021 18:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnqef-0007Uv-5N for guix-patches@gnu.org; Mon, 31 May 2021 18:45:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lnqef-00041B-3K for guix-patches@gnu.org; Mon, 31 May 2021 18:45:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48766] [PATCH 07/14] guix: maven: Use a temporary file to fix pom files. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 May 2021 22:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48766@debbugs.gnu.org Received: via spool by 48766-submit@debbugs.gnu.org id=B48766.162250110315413 (code B ref 48766); Mon, 31 May 2021 22:45:05 +0000 Received: (at 48766) by debbugs.gnu.org; 31 May 2021 22:45:03 +0000 Received: from localhost ([127.0.0.1]:35178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqec-00040L-V1 for submit@debbugs.gnu.org; Mon, 31 May 2021 18:45:03 -0400 Received: from lepiller.eu ([89.234.186.109]:38956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnqeJ-0003xU-2S for 48766@debbugs.gnu.org; Mon, 31 May 2021 18:44:43 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 2d41001e for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=RwUbTj5DGl9suRIePKJhBQUm6 q/gfID+f6dg4+2Mdfk=; b=cnYwNGrHK2CqR4RZEw3qJNgdFIeHDj7Qsld50NuVD nCa67xmj8QOO3Q5lPOHCWzMS65wOiSaO7HVDnqWMqQN1pFcefIlX+8m2kNFfmqbx 3Jie49WpimWPr12elp9671a57ZLeBRs8tewRA5sYghyAMRCcwftG08t964An+eGv DTBqs4+AMFssBN6JLCXoik+psh0IaILpGuh20ozEDAH5Deea4C/UM9AlHaihP2bN 7s/5tXPfLOUP6cDs2Z9E3QIcbYi+0xAL9XYbKbVFjqIQoC4qAv8hYbDt9+u+O7C7 X1abx5aztAJftkaMFovr1/FOO+UntWhpkmjPuieC37MpA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id bf12bcf2 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <48766@debbugs.gnu.org>; Mon, 31 May 2021 22:44:38 +0000 (UTC) From: Julien Lepiller Date: Tue, 1 Jun 2021 00:44:20 +0200 Message-Id: <20210531224427.13300-7-julien@lepiller.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531224427.13300-1-julien@lepiller.eu> References: <20210601004100.69baa2d0@tachikoma.lepiller.eu> <20210531224427.13300-1-julien@lepiller.eu> 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" X-getmail-retrieved-from-mailbox: Patches * guix/build/maven/pom.scm (fix-pom-dependencies): Actually use the temporary file that was created. --- guix/build/maven/pom.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/build/maven/pom.scm b/guix/build/maven/pom.scm index 9c0669c7cd..9e35e47a7f 100644 --- a/guix/build/maven/pom.scm +++ b/guix/build/maven/pom.scm @@ -508,6 +508,7 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect." (throw 'no-such-input group artifact)))))) (let ((tmpfile (string-append pom-file ".tmp"))) - (with-output-to-file pom-file + (with-output-to-file tmpfile (lambda _ - (sxml->xml (fix-maven-xml (fix-pom pom))))))) + (sxml->xml (fix-maven-xml (fix-pom pom))))) + (rename-file tmpfile pom-file)))