From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1F0837B6AB for ; Wed, 12 May 2021 14:33:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 49CB8D422 for ; Wed, 12 May 2021 14:33:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 77FE3D31A for ; Wed, 12 May 2021 14:33:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 510FE46555 for ; Wed, 12 May 2021 14:33:02 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 12 May 2021 14:32:54 +0200 Message-Id: <20210512123258.28178-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210512123258.28178-1-f.ebner@proxmox.com> References: <20210512123258.28178-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 5/9] cli tools: correctly handle warnings status X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 12:33:37 -0000 Signed-off-by: Fabian Ebner --- PVE/CLI/pveceph.pm | 2 +- PVE/CLI/pvenode.pm | 2 +- PVE/CLI/vzdump.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm index 2745cc62..c02dc3fe 100755 --- a/PVE/CLI/pveceph.pm +++ b/PVE/CLI/pveceph.pm @@ -35,7 +35,7 @@ my $nodename = PVE::INotify::nodename(); my $upid_exit = sub { my $upid = shift; my $status = PVE::Tools::upid_read_status($upid); - exit($status eq 'OK' ? 0 : -1); + exit(PVE::Tools::upid_status_is_error($status) ? -1 : 0); }; sub setup_environment { diff --git a/PVE/CLI/pvenode.pm b/PVE/CLI/pvenode.pm index b05b3e15..acef6c3b 100644 --- a/PVE/CLI/pvenode.pm +++ b/PVE/CLI/pvenode.pm @@ -36,7 +36,7 @@ my $upid_exit = sub { my $upid = shift; my $status = PVE::Tools::upid_read_status($upid); print "Task $status\n"; - exit($status eq 'OK' ? 0 : -1); + exit(PVE::Tools::upid_status_is_error($status) ? -1 : 0); }; sub param_mapping { diff --git a/PVE/CLI/vzdump.pm b/PVE/CLI/vzdump.pm index fe5fd049..3f625574 100755 --- a/PVE/CLI/vzdump.pm +++ b/PVE/CLI/vzdump.pm @@ -19,7 +19,7 @@ our $cmddef = [ 'PVE::API2::VZDump', 'vzdump', 'vmid', undef, my $upid = shift; exit(0) if $upid eq 'OK'; my $status = PVE::Tools::upid_read_status($upid); - exit($status eq 'OK' ? 0 : -1); + exit(PVE::Tools::upid_status_is_error($status) ? -1 : 0); }]; 1; -- 2.20.1