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 61B286B8EA for ; Wed, 17 Mar 2021 15:19:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5AC932E9F4 for ; Wed, 17 Mar 2021 15:19:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 CEF3F2E9EA for ; Wed, 17 Mar 2021 15:19:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9AD6141931 for ; Wed, 17 Mar 2021 15:19:18 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 17 Mar 2021 15:19:18 +0100 Message-Id: <20210317141918.24843-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210317141918.24843-1-d.csapak@proxmox.com> References: <20210317141918.24843-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.183 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [subscription.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/2] tools/subscription: ignore ENOENT for apt auth config removal X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 14:19:19 -0000 deleting a nonexistant file is hardly an error worth mentioning Signed-off-by: Dominik Csapak --- src/tools/subscription.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/subscription.rs b/src/tools/subscription.rs index 07c6b40f..9b9534ac 100644 --- a/src/tools/subscription.rs +++ b/src/tools/subscription.rs @@ -318,8 +318,11 @@ pub fn update_apt_auth(key: Option, password: Option) -> Result< replace_file(auth_conf, conf.as_bytes(), file_opts) .map_err(|e| format_err!("Error saving apt auth config - {}", e))?; } - _ => nix::unistd::unlink(auth_conf) - .map_err(|e| format_err!("Error clearing apt auth config - {}", e))?, + _ => match nix::unistd::unlink(auth_conf) { + Ok(()) => Ok(()), + Err(nix::Error::Sys(nix::errno::Errno::ENOENT)) => Ok(()), // ignore not existing + Err(err) => Err(err), + }.map_err(|e| format_err!("Error clearing apt auth config - {}", e))?, } Ok(()) } -- 2.20.1