From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id D64ED1FF16B for ; Thu, 28 Nov 2024 17:07:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 925BFA7AF; Thu, 28 Nov 2024 17:07:40 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Nov 2024 17:07:21 +0100 Message-Id: <20241128160721.583578-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241128160721.583578-1-c.ebner@proxmox.com> References: <20241128160721.583578-1-c.ebner@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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH v2 proxmox-backup 3/3] sync: push: use direct api version comparison in compatibility checks 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Use the trait implementations of `ApiVersion` to perform operator based version comparisons. This makes the comparison more readable and reduces the risk for errors. No functional change intended. Signed-off-by: Christian Ebner --- changes since version 1: - use operator based version comparison, improving code readability src/server/push.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/server/push.rs b/src/server/push.rs index 95c7c6bff..fdd259aff 100644 --- a/src/server/push.rs +++ b/src/server/push.rs @@ -129,13 +129,11 @@ impl PushParameters { let api_version = ApiVersion::try_from(version_info)?; // push assumes namespace support on the remote side, fail early if missing - if api_version.major < 2 || (api_version.major == 2 && api_version.minor < 2) { + if api_version < ApiVersion::new(2, 2, 0) { bail!("Unsupported remote api version, minimum v2.2 required"); } - let supports_prune_delete_stats = api_version.major > 3 - || (api_version.major == 3 && api_version.minor >= 3) - || (api_version.major == 3 && api_version.minor == 2 && api_version.release >= 11); + let supports_prune_delete_stats = api_version >= ApiVersion::new(3, 2, 11); let target = PushTarget { remote, -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel