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 6E14F93066 for ; Thu, 15 Sep 2022 15:10:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 447D419AA3 for ; Thu, 15 Sep 2022 15:09:45 +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 for ; Thu, 15 Sep 2022 15:09:44 +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 8FF8E442DF for ; Thu, 15 Sep 2022 15:09:44 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 15 Sep 2022 15:09:18 +0200 Message-Id: <20220915130918.727902-8-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220915130918.727902-1-f.gruenbichler@proxmox.com> References: <20220915130918.727902-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.157 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pve-devel] [PATCH proxmox-offline-mirror 4/4] mirror: use new architecture helper 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: Thu, 15 Sep 2022 13:10:15 -0000 in order to avoid having a list of arch-specific references on two places. Signed-off-by: Fabian Grünbichler --- requires proxmox-apt > 0.9.1 with the new helper src/mirror.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mirror.rs b/src/mirror.rs index 6cbd680..3370ca4 100644 --- a/src/mirror.rs +++ b/src/mirror.rs @@ -501,14 +501,14 @@ pub fn create_snapshot( || match &reference.file_type { FileReferenceType::Ignored => true, FileReferenceType::PDiff => true, // would require fetching the patches as well - FileReferenceType::Contents(arch, _) - | FileReferenceType::ContentsUdeb(arch, _) - | FileReferenceType::Packages(arch, _) - | FileReferenceType::PseudoRelease(Some(arch)) => { - !binary || !config.architectures.contains(arch) - } FileReferenceType::Sources(_) => !source, - _ => false, + _ => { + if let Some(arch) = reference.file_type.architecture() { + !binary || !config.architectures.contains(arch) + } else { + false + } + } }; if skip { println!("Skipping {}", reference.path); -- 2.30.2