update to first proxmox crate split
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
@ -1,10 +1,8 @@
|
||||
use std::fs::File;
|
||||
use std::io::Read;
|
||||
|
||||
use proxmox::{
|
||||
sys::error::SysError,
|
||||
tools::Uuid,
|
||||
};
|
||||
use proxmox::sys::error::SysError;
|
||||
use proxmox_uuid::Uuid;
|
||||
|
||||
use pbs_tape::{
|
||||
PROXMOX_TAPE_BLOCK_SIZE,
|
||||
@ -53,9 +51,9 @@ pub fn tape_write_catalog<'a>(
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
let mut file_copy_buffer = proxmox::tools::vec::undefined(PROXMOX_TAPE_BLOCK_SIZE);
|
||||
let mut file_copy_buffer = proxmox_io::vec::undefined(PROXMOX_TAPE_BLOCK_SIZE);
|
||||
|
||||
let result: Result<(), std::io::Error> = proxmox::try_block!({
|
||||
let result: Result<(), std::io::Error> = proxmox_lang::try_block!({
|
||||
|
||||
let file_size = file.metadata()?.len();
|
||||
let mut remaining = file_size;
|
||||
|
@ -3,10 +3,8 @@ use std::io::Read;
|
||||
use anyhow::{bail, Error};
|
||||
use endian_trait::Endian;
|
||||
|
||||
use proxmox::tools::{
|
||||
Uuid,
|
||||
io::ReadExt,
|
||||
};
|
||||
use proxmox_io::ReadExt;
|
||||
use proxmox_uuid::Uuid;
|
||||
|
||||
use pbs_datastore::DataBlob;
|
||||
use pbs_tape::{
|
||||
|
@ -6,7 +6,7 @@ use std::collections::HashMap;
|
||||
use endian_trait::Endian;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use proxmox::tools::Uuid;
|
||||
use proxmox_uuid::Uuid;
|
||||
|
||||
use pbs_api_types::Fingerprint;
|
||||
|
||||
|
@ -2,7 +2,7 @@ use std::io::{Read};
|
||||
|
||||
use anyhow::{bail, Error};
|
||||
|
||||
use proxmox::tools::io::ReadExt;
|
||||
use proxmox_io::ReadExt;
|
||||
|
||||
use pbs_tape::{TapeRead, MediaContentHeader};
|
||||
|
||||
@ -50,7 +50,7 @@ impl <'a> Read for MultiVolumeReader<'a> {
|
||||
let mut reader = (self.next_reader_fn)()
|
||||
.map_err(|err| proxmox::io_format_err!("multi-volume next failed: {}", err))?;
|
||||
|
||||
proxmox::try_block!({
|
||||
proxmox_lang::try_block!({
|
||||
let part_header: MediaContentHeader = unsafe { reader.read_le_value()? };
|
||||
self.reader = Some(reader);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
use anyhow::Error;
|
||||
|
||||
use proxmox::tools::Uuid;
|
||||
use proxmox_uuid::Uuid;
|
||||
|
||||
use pbs_tape::{TapeWrite, MediaContentHeader};
|
||||
|
||||
|
@ -2,10 +2,8 @@ use std::io::{Read, Write};
|
||||
use std::pin::Pin;
|
||||
use std::task::{Context, Poll};
|
||||
|
||||
use proxmox::{
|
||||
sys::error::SysError,
|
||||
tools::Uuid,
|
||||
};
|
||||
use proxmox::sys::error::SysError;
|
||||
use proxmox_uuid::Uuid;
|
||||
|
||||
use pbs_tape::{
|
||||
PROXMOX_TAPE_BLOCK_SIZE,
|
||||
@ -46,9 +44,9 @@ pub fn tape_write_snapshot_archive<'a>(
|
||||
|
||||
let root_metadata = pxar::Metadata::dir_builder(0o0664).build();
|
||||
|
||||
let mut file_copy_buffer = proxmox::tools::vec::undefined(PROXMOX_TAPE_BLOCK_SIZE);
|
||||
let mut file_copy_buffer = proxmox_io::vec::undefined(PROXMOX_TAPE_BLOCK_SIZE);
|
||||
|
||||
let result: Result<(), std::io::Error> = proxmox::try_block!({
|
||||
let result: Result<(), std::io::Error> = proxmox_lang::try_block!({
|
||||
|
||||
let leom = writer.write_header(&header, &header_data)?;
|
||||
if leom {
|
||||
|
Reference in New Issue
Block a user