From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D3FDE1FF177 for ; Fri, 2 Aug 2024 15:27:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C1E37DC41; Fri, 2 Aug 2024 15:27:54 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 2 Aug 2024 15:26:43 +0200 Message-Id: <20240802132656.270077-6-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240802132656.270077-1-m.carrara@proxmox.com> References: <20240802132656.270077-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 v1 pve-common 05/18] pbsclient: use cond. statements instead of chained 'or' operators 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" .. like in the `delete_encryption_key` subroutine below, as it's more readable at a glance. Signed-off-by: Max Carrara --- src/PVE/PBSClient.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm index ab1fa62..d707971 100644 --- a/src/PVE/PBSClient.pm +++ b/src/PVE/PBSClient.pm @@ -77,7 +77,10 @@ sub delete_password { my $pwfile = password_file_name($self); - unlink $pwfile or $! == ENOENT or die "deleting password file failed - $!\n"; + if (!unlink($pwfile)) { + return if $! == ENOENT; + die "deleting password file failed - $!\n"; + } }; sub get_password { -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel