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 C3C9C1FF173 for ; Mon, 27 Jan 2025 13:27:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5B0982A06D; Mon, 27 Jan 2025 13:27:44 +0100 (CET) Date: Mon, 27 Jan 2025 13:27:38 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20250127121016.247973-1-m.sandoval@proxmox.com> <20250127121016.247973-3-m.sandoval@proxmox.com> In-Reply-To: <20250127121016.247973-3-m.sandoval@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1737980632.gpzckicfhf.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.051 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] applied: [PATCH backup v3 3/3] pxar: extract: Follow overwrite_flags when opening file 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" On January 27, 2025 1:10 pm, Maximiliano Sandoval wrote: > Signed-off-by: Maximiliano Sandoval > --- > pbs-client/src/pxar/extract.rs | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs > index 64754006..6b0e6302 100644 > --- a/pbs-client/src/pxar/extract.rs > +++ b/pbs-client/src/pxar/extract.rs > @@ -133,9 +133,18 @@ where > > if let Some(ref path) = options.prelude_path { > if let Some(entry) = prelude { > - let mut prelude_file = OpenOptions::new() > - .create(true) > - .write(true) > + let overwrite = options.overwrite_flags.contains(OverwriteFlags::FILE); > + > + let mut open_options = OpenOptions::new(); > + open_options.write(true); > + if overwrite { > + open_options.create(true); > + open_options.truncate(true); > + } else { > + open_options.create_new(true); > + } > + > + let mut prelude_file = open_options > .open(path) > .with_context(|| format!("error creating prelude file '{path:?}'"))?; > if let pxar::EntryKind::Prelude(ref prelude) = entry.kind() { > -- > 2.39.5 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel