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 18134690D3 for ; Thu, 12 Nov 2020 10:53:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 07D4BCD4D for ; Thu, 12 Nov 2020 10:53:00 +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 9A90ECD45 for ; Thu, 12 Nov 2020 10:52:59 +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 626AD42117 for ; Thu, 12 Nov 2020 10:52:59 +0100 (CET) From: Mira Limbeck To: pbs-devel@lists.proxmox.com Date: Thu, 12 Nov 2020 10:52:20 +0100 Message-Id: <20201112095220.26680-1-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.233 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an 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. [apt.rs] Subject: [pbs-devel] [PATCH proxmox-backup] fix running_kernel string for unknown package case 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: Thu, 12 Nov 2020 09:53:30 -0000 Signed-off-by: Mira Limbeck --- I always use rustfmt for formatting as Wolfgang always urges us to do. And it seems rather eager to put function arguments in new lines. src/api2/node/apt.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index 765ea525..09d56123 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -303,10 +303,13 @@ pub fn get_versions() -> Result, Error> { None, ); - let running_kernel = nix::sys::utsname::uname().release().to_owned(); + let running_kernel = format!( + "running kernel: {}", + nix::sys::utsname::uname().release().to_owned() + ); if let Some(proxmox_backup) = pbs_packages.iter().find(|pkg| pkg.package == "proxmox-backup") { let mut proxmox_backup = proxmox_backup.clone(); - proxmox_backup.extra_info = Some(format!("running kernel: {}", running_kernel)); + proxmox_backup.extra_info = Some(running_kernel); packages.push(proxmox_backup); } else { packages.push(unknown_package("proxmox-backup".into(), Some(running_kernel))); -- 2.20.1