[pbs-devel] [PATCH proxmox-backup 1/6] catalog dump: preserve original mtime
Fabian Grünbichler
f.gruenbichler at proxmox.com
Fri Sep 11 14:34:34 CEST 2020
even if it can't be handled by chrono. silently replacing it with epoch
0 is confusing..
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
src/backup/catalog.rs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/backup/catalog.rs b/src/backup/catalog.rs
index bc2e471e..85a32623 100644
--- a/src/backup/catalog.rs
+++ b/src/backup/catalog.rs
@@ -5,7 +5,7 @@ use std::io::{Read, Write, Seek, SeekFrom};
use std::os::unix::ffi::OsStrExt;
use anyhow::{bail, format_err, Error};
-use chrono::offset::{TimeZone, Local};
+use chrono::offset::{TimeZone, Local, LocalResult};
use pathpatterns::{MatchList, MatchType};
use proxmox::tools::io::ReadExt;
@@ -533,17 +533,17 @@ impl <R: Read + Seek> CatalogReader<R> {
self.dump_dir(&path, pos)?;
}
CatalogEntryType::File => {
- let dt = Local
- .timestamp_opt(mtime as i64, 0)
- .single() // chrono docs say timestamp_opt can only be None or Single!
- .unwrap_or_else(|| Local.timestamp(0, 0));
+ let mtime_string = match Local.timestamp_opt(mtime as i64, 0) {
+ LocalResult::Single(time) => time.to_rfc3339_opts(chrono::SecondsFormat::Secs, false),
+ _ => (mtime as i64).to_string(),
+ };
println!(
"{} {:?} {} {}",
etype,
path,
size,
- dt.to_rfc3339_opts(chrono::SecondsFormat::Secs, false),
+ mtime_string,
);
}
_ => {
--
2.20.1
More information about the pbs-devel
mailing list