[pbs-devel] applied: [PATCH proxmox-backup-qemu 6/6] update to new BackupDir constructor

[Dietmar Maurer]

applied (after proxmox-backup version bump)

> On 09/11/2020 2:34 PM Fabian Grünbichler <f.gruenbichler at proxmox.com> wrote:
> 
>  
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
>  Cargo.toml    | 4 ++--
>  src/backup.rs | 2 +-
>  src/lib.rs    | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Cargo.toml b/Cargo.toml
> index 649b4c5..664bba2 100644
> --- a/Cargo.toml
> +++ b/Cargo.toml
> @@ -25,7 +25,7 @@ libc = "0.2"
>  once_cell = "1.3.1"
>  openssl = "0.10"
>  proxmox = { version = "0.3.5", features = [ "sortable-macro", "api-macro" ] }
> -proxmox-backup = { git = "git://git.proxmox.com/git/proxmox-backup.git", tag = "v0.8.15" }
> -#proxmox-backup = { path = "../proxmox-backup" }
> +#proxmox-backup = { git = "git://git.proxmox.com/git/proxmox-backup.git", tag = "v0.8.15" }
> +proxmox-backup = { path = "../proxmox-backup" }
>  serde_json = "1.0"
>  tokio = { version = "0.2.9", features = [ "blocking", "fs", "io-util", "macros", "rt-threaded", "signal", "stream", "tcp", "time", "uds" ] }
> diff --git a/src/backup.rs b/src/backup.rs
> index 094f8b3..aa65239 100644
> --- a/src/backup.rs
> +++ b/src/backup.rs
> @@ -59,7 +59,7 @@ impl BackupTask {
>  
>          let (abort, _) = tokio::sync::broadcast::channel(16);
>  
> -        let snapshot = BackupDir::new(&setup.backup_type, &setup.backup_id, setup.backup_time.timestamp());
> +        let snapshot = BackupDir::new(&setup.backup_type, &setup.backup_id, setup.backup_time.timestamp())?;
>          let manifest = Arc::new(Mutex::new(BackupManifest::new(snapshot)));
>  
>          let registry = Arc::new(Mutex::new(Registry::<ImageUploadInfo>::new()));
> diff --git a/src/lib.rs b/src/lib.rs
> index 5bb3685..67f2fe9 100644
> --- a/src/lib.rs
> +++ b/src/lib.rs
> @@ -98,7 +98,7 @@ pub extern "C" fn proxmox_backup_snapshot_string(
>          let backup_id: String = tools::utf8_c_string_lossy(backup_id)
>              .ok_or_else(|| format_err!("backup_id must not be NULL"))?;
>  
> -        let snapshot = BackupDir::new(backup_type, backup_id, backup_time);
> +        let snapshot = BackupDir::new(backup_type, backup_id, backup_time)?;
>  
>          Ok(CString::new(format!("{}", snapshot))?)
>      });
> -- 
> 2.20.1
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel