diff --git a/src/api2/tape/backup.rs b/src/api2/tape/backup.rs index 35406595..0c29b441 100644 --- a/src/api2/tape/backup.rs +++ b/src/api2/tape/backup.rs @@ -10,9 +10,9 @@ use proxmox_schema::api; use proxmox_sys::{task_log, task_warn, WorkerTaskContext}; use pbs_api_types::{ - Authid, BackupNamespace, GroupFilter, MediaPoolConfig, Operation, TapeBackupJobConfig, - TapeBackupJobSetup, TapeBackupJobStatus, Userid, JOB_ID_SCHEMA, PRIV_DATASTORE_READ, - PRIV_TAPE_AUDIT, PRIV_TAPE_WRITE, UPID_SCHEMA, + Authid, GroupFilter, MediaPoolConfig, Operation, TapeBackupJobConfig, TapeBackupJobSetup, + TapeBackupJobStatus, Userid, JOB_ID_SCHEMA, PRIV_DATASTORE_READ, PRIV_TAPE_AUDIT, + PRIV_TAPE_WRITE, UPID_SCHEMA, }; use pbs_config::CachedUserInfo; diff --git a/src/tape/media_catalog.rs b/src/tape/media_catalog.rs index 369ba18c..85128f80 100644 --- a/src/tape/media_catalog.rs +++ b/src/tape/media_catalog.rs @@ -742,12 +742,13 @@ impl MediaCatalog { return Ok((false, None, None)); } - if magic == Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_0 { - // only use in unreleased versions - bail!("old catalog format (v1.0) is no longer supported"); - } - if magic != Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_1 { - bail!("wrong magic number"); + match magic { + // only used in unreleased versions + Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_0 => { + bail!("old catalog format (v1.0) is no longer supported") + } + Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_1 => {} + _ => bail!("wrong magic number"), } let mut entry_type = [0u8; 1]; @@ -800,12 +801,14 @@ impl MediaCatalog { Ok(true) => { /* OK */ } Err(err) => bail!("read failed - {}", err), } - if magic == Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_0 { - // only use in unreleased versions - bail!("old catalog format (v1.0) is no longer supported"); - } - if magic != Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_1 { - bail!("wrong magic number"); + + match magic { + // only used in unreleased versions + Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_0 => { + bail!("old catalog format (v1.0) is no longer supported") + } + Self::PROXMOX_BACKUP_MEDIA_CATALOG_MAGIC_1_1 => {} + _ => bail!("wrong magic number"), } found_magic_number = true; continue;