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

update to first proxmox crate split

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2021-10-08 11:19:37 +02:00
parent e3f3359c86
commit 6ef1b649d9
265 changed files with 880 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tape/pool_writer/catalog_set.rs
View File

@ -1,6 +1,6 @@
use anyhow::{bail, Error};
use proxmox::tools::Uuid;
use proxmox_uuid::Uuid;
use crate::{
tape::{

6
src/tape/pool_writer/mod.rs
View File

@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex};
use anyhow::{bail, Error};
use proxmox::tools::Uuid;
use proxmox_uuid::Uuid;
use pbs_tools::{task_log, task_warn};
use pbs_config::tape_encryption_keys::load_key_configs;
@ -74,7 +74,7 @@ impl PoolWriter {
force_media_set: bool,
) -> Result<Self, Error> {
let current_time = proxmox::tools::time::epoch_i64();
let current_time = proxmox_time::epoch_i64();
let new_media_set_reason = pool.start_write_session(current_time, force_media_set)?;
if let Some(reason) = new_media_set_reason {
@ -202,7 +202,7 @@ impl PoolWriter {
None => None,
};
let current_time = proxmox::tools::time::epoch_i64();
let current_time = proxmox_time::epoch_i64();
let media_uuid = self.pool.alloc_writable_media(current_time)?;
let media = self.pool.lookup_media(&media_uuid).unwrap();

2
src/tape/pool_writer/new_chunks_iterator.rs
View File

@ -36,7 +36,7 @@ impl NewChunksIterator {
let datastore_name = snapshot_reader.datastore_name();
let result: Result<(), Error> = proxmox::try_block!({
let result: Result<(), Error> = proxmox_lang::try_block!({
let mut chunk_iter = snapshot_reader.chunk_iterator()?;