From patchwork Sat Dec 21 17:04:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35113 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 276A227BBE2; Sat, 21 Dec 2024 17:06:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D89C327BBE9 for ; Sat, 21 Dec 2024 17:06:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tP2vX-0005RK-BD; Sat, 21 Dec 2024 12:06:07 -0500 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 1tP2vU-0005Qb-E0 for guix-patches@gnu.org; Sat, 21 Dec 2024 12:06:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tP2vU-0003Os-5H for guix-patches@gnu.org; Sat, 21 Dec 2024 12:06:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Mw+ehuOp4qN5OjjC6W+smX2JhCbLDNj/BpSr9ONpyeA=; b=GfV5cOele0O5+gSzEg9SibXcS6HeEnc6Dt1Vh9ehuVLOsUMdFAuuNsVnGdNK/OBX4U43EfyZoT0gltz3AwdazzP7UyOZG8x3NcGosOi7iA9yF4M205LDNsYP9GLzC5Uh46k0LTZ/mhRM6kHTXtXhCB+qCb5xZpvZ6+FAH1f4iWv4Fs46ZEtjP5KY5nEwJl1rXsIV6CReKk+6mr4VV1L6Po6l0+D424LF+DSKOwLo3fzLkuAvvqJDoyPnlGB5m53eFrSweltMHYirUcPbXz+1yHy7JY0LMbS6DDsy3IwdEd/BekN64QeU3aJyYaUYt9sqYOrBEtGnIZglf/AoNbtXrg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tP2vT-0005RH-Q9 for guix-patches@gnu.org; Sat, 21 Dec 2024 12:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75010] [PATCH 3/7] gnu: machine: ssh: Return monadic value from roll-back-managed-host. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Dec 2024 17:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75010@debbugs.gnu.org Received: via spool by 75010-submit@debbugs.gnu.org id=B75010.173480071520793 (code B ref 75010); Sat, 21 Dec 2024 17:06:03 +0000 Received: (at 75010) by debbugs.gnu.org; 21 Dec 2024 17:05:15 +0000 Received: from localhost ([127.0.0.1]:47519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP2uh-0005PC-1C for submit@debbugs.gnu.org; Sat, 21 Dec 2024 12:05:15 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:38121 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP2ua-0005I2-Eq for 75010@debbugs.gnu.org; Sat, 21 Dec 2024 12:05:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734800697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q/q4Qebf9NGtSGG6njgIa5LiFgClro62TGrj78Uwy1g=; b=GlCjO/yyh+uSImac/iZTFcRIk7MFuqPlr8ERPFu43KOZlLMBNa+YTXvTDFi0PVVg/iTmJx +bB4mi+QZPi06Ud8lKZkgEs3JALCvJUCCBDmQRvQjctFkCZWT0BEqVogDt4coQrxaJH4cK UTyn7LnbTMTwCJu57WnmQU7jmk0264Yl6jy21lqNWQWJxH688zAcvDkm/j22/B5YVGusUB 18232AmswaSckhyrH+22RCxHWTw4I/F0jxXVTwqS0qMpFLR+eYtb1pptmfFwajekKfDwik sz2X0IG4Yrf4tb/o98mSpcJz3kMIuuof8X9wUyEFvmuDa80dqap+SOY9/RCJUw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f6bd2c01 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75010@debbugs.gnu.org>; Sat, 21 Dec 2024 17:04:57 +0000 (UTC) Date: Sat, 21 Dec 2024 18:04:07 +0100 Message-ID: <9d7e69af958b651dd463d93822c0b493e201387a.1734798943.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/machine/ssh.scm (roll-back-managed-host): Use return. Change-Id: Ibe7ddd5758173a6835d8796c9c5ae5ba306b3334 --- gnu/machine/ssh.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 24c36a1936..c76b51c757 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -612,9 +612,9 @@ (define (roll-back-managed-host machine) #:old-entries old-entries))) (mlet %store-monad ((remote-result (machine-remote-eval machine remote-exp))) - (when (eqv? 'error remote-result) - (raise roll-back-failure))))) - (_ (raise roll-back-failure)))) + (mwhen (eqv? 'error remote-result) + (return (raise roll-back-failure)))))) + (_ (return (raise roll-back-failure))))) ;;;