tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/bin/proxmox-backup-client.rs: include file extension in backupspec

Browse Source
This commit is contained in:
Dietmar Maurer 2019-03-11 10:23:16 +01:00
parent fc2bf37ead
commit 74cdb52107
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/proxmox-backup-client.rs
View File

@ -25,7 +25,7 @@ use regex::Regex;
use lazy_static::lazy_static; use lazy_static::lazy_static;
lazy_static! { lazy_static! {
static ref BACKUPSPEC_REGEX: Regex = Regex::new(r"^([a-zA-Z0-9_-]+):(.+)$").unwrap(); static ref BACKUPSPEC_REGEX: Regex = Regex::new(r"^([a-zA-Z0-9_-]+\.(:?catar|raw)):(.+)$").unwrap();
} }
fn backup_directory<P: AsRef<Path>>( fn backup_directory<P: AsRef<Path>>(
@ -324,9 +324,7 @@ fn create_backup(
if (stat.st_mode & libc::S_IFDIR) != 0 { if (stat.st_mode & libc::S_IFDIR) != 0 {
let target = format!("{}.catar", target); upload_list.push((filename.to_owned(), target.to_owned()));
upload_list.push((filename.to_owned(), target));
} else if (stat.st_mode & (libc::S_IFREG|libc::S_IFBLK)) != 0 { } else if (stat.st_mode & (libc::S_IFREG|libc::S_IFBLK)) != 0 {
if stat.st_size <= 0 { bail!("got strange file size '{}'", stat.st_size); } if stat.st_size <= 0 { bail!("got strange file size '{}'", stat.st_size); }
@ -488,7 +486,7 @@ fn main() {
.required( .required(
"backupspec", "backupspec",
ArraySchema::new( ArraySchema::new(
"List of backup source specifications ([<label>:<path>] ...)", "List of backup source specifications ([<label.ext>:<path>] ...)",
backup_source_schema, backup_source_schema,
).min_length(1) ).min_length(1)
) )