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 7AB46B3DA3 for ; Wed, 29 Nov 2023 15:51:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C9FD9CE4 for ; Wed, 29 Nov 2023 15:51:27 +0100 (CET) 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 for ; Wed, 29 Nov 2023 15:51:26 +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 212F140EC3 for ; Wed, 29 Nov 2023 15:51:26 +0100 (CET) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Wed, 29 Nov 2023 15:51:16 +0100 Message-Id: <20231129145116.202049-4-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231129145116.202049-1-s.sterz@proxmox.com> References: <20231129145116.202049-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.085 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-offline-mirror v2 3/3] offline mirror binary: rustfmt clean up 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, 29 Nov 2023 14:51:57 -0000 Signed-off-by: Stefan Sterz --- src/bin/proxmox-offline-mirror.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs index a6d6c49..c645c2d 100644 --- a/src/bin/proxmox-offline-mirror.rs +++ b/src/bin/proxmox-offline-mirror.rs @@ -179,8 +179,8 @@ fn derive_debian_repo( (Release::Bookworm, DebianVariant::Security) => { "/usr/share/keyrings/debian-archive-bookworm-security-automatic.gpg" } - (Release::Bookworm, DebianVariant::Updates) | - (Release::Bookworm, DebianVariant::Backports) => { + (Release::Bookworm, DebianVariant::Updates) + | (Release::Bookworm, DebianVariant::Backports) => { "/usr/share/keyrings/debian-archive-bookworm-automatic.gpg" } (Release::Bookworm, _) => "/usr/share/keyrings/debian-archive-bookworm-stable.gpg", @@ -239,13 +239,11 @@ fn action_add_mirror(config: &SectionConfigData) -> Result, Er let default_components = match release { Release::Bookworm => "main contrib non-free non-free-firmware", - _ => "main contrib non-free" + _ => "main contrib non-free", }; - let components = read_string_from_tty( - "Enter repository components", - Some(default_components), - )?; + let components = + read_string_from_tty("Enter repository components", Some(default_components))?; derive_debian_repo(release, variant, &components)? } -- 2.39.2