use the commit patch for the compile fix

Signed-off-by: Wolfgang <github@linux-dude.de>
This commit is contained in:
Wolfgang
2025-11-08 09:12:24 +00:00
parent 3e6525f604
commit da9eaf4a5b
2 changed files with 34 additions and 2 deletions

View File

@@ -361,9 +361,9 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P
patch -p1 -d proxmox-backup/ <"${PATCHES}/proxmox-backup-cross.patch"
sed -i 's/\(xindy\|proxmox-biome\)\b/\1:native/' proxmox-backup/debian/control
fi
cd proxmox-backup/
# fix compile error with pxar
git revert --no-edit 6174f9b3c7d1cf366de230798d4bf9e271235dbe
patch -p1 -R -d proxmox-backup/ < "${PATCHES}/proxmox-backup-compile-fix.patch"
cd proxmox-backup/
set_package_info
cargo vendor
${SUDO} apt -y build-dep -a${PACKAGE_ARCH} ${BUILD_PROFILES} .

View File

@@ -0,0 +1,32 @@
commit 6174f9b3c7d1cf366de230798d4bf9e271235dbe
Author: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri Nov 7 12:33:15 2025 +0100
pxar extract: code style improvement for error logging
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs
index 61f29349..0257201d 100644
--- a/pbs-client/src/pxar/extract.rs
+++ b/pbs-client/src/pxar/extract.rs
@@ -1333,15 +1333,12 @@ where
}
.await
{
- let display_string = entry.path().display().to_string();
error!(
- "error extracting {}: {}",
- if matches!(entry.kind(), EntryKind::GoodbyeTable) {
- "<directory>"
- } else {
- &display_string
+ "error extracting {}: {err}",
+ match entry.kind() {
+ EntryKind::GoodbyeTable => "<directory>",
+ _ => &entry.path().display().to_string(),
},
- err
);
}