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 EC0AB9B316 for ; Mon, 20 Nov 2023 12:59:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D0F0018B34 for ; Mon, 20 Nov 2023 12:59:39 +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 ; Mon, 20 Nov 2023 12:59:39 +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 293B54341B for ; Mon, 20 Nov 2023 12:59:39 +0100 (CET) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Mon, 20 Nov 2023 12:59:30 +0100 Message-Id: <20231120115930.60210-3-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120115930.60210-1-f.schauer@proxmox.com> References: <20231120115930.60210-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.201 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 backup 1/1] fix #4995: pxar: Include symlinks in zip file restore 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: Mon, 20 Nov 2023 11:59:40 -0000 Signed-off-by: Filip Schauer --- pbs-client/src/pxar/extract.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs index f78e06c2..6f23c144 100644 --- a/pbs-client/src/pxar/extract.rs +++ b/pbs-client/src/pxar/extract.rs @@ -998,6 +998,7 @@ where metadata.stat.mtime.secs, metadata.stat.mode as u16, false, + None, ); zip.add_entry::>(entry, None).await?; } @@ -1017,6 +1018,7 @@ where metadata.stat.mtime.secs, metadata.stat.mode as u16, true, + None, ); zip.add_entry(entry, decoder.contents()) .await @@ -1035,6 +1037,7 @@ where metadata.stat.mtime.secs, metadata.stat.mode as u16, true, + None, ); zip.add_entry(entry, decoder.contents()) .await @@ -1047,9 +1050,24 @@ where metadata.stat.mtime.secs, metadata.stat.mode as u16, false, + None, ); zip.add_entry::>(entry, None).await?; } + EntryKind::Symlink(link) => { + log::debug!("adding '{}' to zip", path.display()); + let realpath = Path::new(link); + + let entry = ZipEntry::new( + path, + metadata.stat.mtime.secs, + metadata.stat.mode as u16, + true, + Some(realpath), + ); + + zip.add_entry::>(entry, None).await?; + } _ => {} // ignore all else }; } -- 2.39.2