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

update to nix 0.24 / rustyline 9 / proxmox-sys 0.3

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2022-06-02 13:10:33 +02:00
parent 68a6e970d4
commit 11ca834317
34 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pbs-tape/Cargo.toml
View File

@ -12,7 +12,7 @@ anyhow = "1.0"
thiserror = "1.0"
endian_trait = { version = "0.6", features = ["arrays"] }
hex = "0.4.3"
nix = "0.19.1"
nix = "0.24"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
bitflags = "1.2.1"
@ -28,7 +28,7 @@ proxmox-uuid = "1"
# router::cli is only used by binaries, so maybe we should split them out
proxmox-router = "1.2"
proxmox-sys = "0.2"
proxmox-sys = "0.3"
pbs-api-types = { path = "../pbs-api-types" }
pbs-config = { path = "../pbs-config" }

4
pbs-tape/src/sgutils2.rs
View File

@ -442,7 +442,7 @@ impl<'a, F: AsRawFd> SgRaw<'a, F> {
SCSI_PT_DO_TIMEOUT => return Err(format_err!("do_scsi_pt failed - timeout").into()),
code if code < 0 => {
let errno = unsafe { get_scsi_pt_os_err(ptvp.as_ptr()) };
let err = nix::Error::from_errno(nix::errno::Errno::from_i32(errno));
let err = nix::errno::Errno::from_i32(errno);
return Err(format_err!("do_scsi_pt failed with err {}", err).into());
}
unknown => {
@ -524,7 +524,7 @@ impl<'a, F: AsRawFd> SgRaw<'a, F> {
}
SCSI_PT_RESULT_OS_ERR => {
let errno = unsafe { get_scsi_pt_os_err(ptvp.as_ptr()) };
let err = nix::Error::from_errno(nix::errno::Errno::from_i32(errno));
let err = nix::errno::Errno::from_i32(errno);
return Err(format_err!("scsi command failed with err {}", err).into());
}
unknown => {