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

tape: cleanup - rename 'info' to 'media_id'

Browse Source
This commit is contained in:
Dietmar Maurer 2021-01-03 10:37:42 +01:00
parent 74595b8821
commit f046313c0e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tape/pool_writer.rs
View File

@ -340,7 +340,7 @@ fn drive_load_and_label_media(
media_id: &MediaId, media_id: &MediaId,
) -> Result<(Box<dyn TapeDriver>, MediaCatalog), Error> { ) -> Result<(Box<dyn TapeDriver>, MediaCatalog), Error> {
let (mut tmp_drive, info) = let (mut tmp_drive, media_id) =
request_and_load_media(worker, &drive_config, &drive_name, &media_id.label)?; request_and_load_media(worker, &drive_config, &drive_name, &media_id.label)?;
let media_catalog; let media_catalog;
@ -354,16 +354,16 @@ fn drive_load_and_label_media(
let status_path = Path::new(TAPE_STATUS_DIR); let status_path = Path::new(TAPE_STATUS_DIR);
match &info.media_set_label { match &media_id.media_set_label {
None => { None => {
println!("wrinting new media set label"); println!("wrinting new media set label");
tmp_drive.write_media_set_label(new_set)?; tmp_drive.write_media_set_label(new_set)?;
let info = MediaId { let media_id = MediaId {
label: info.label, label: media_id.label,
media_set_label: Some(new_set.clone()), media_set_label: Some(new_set.clone()),
}; };
media_catalog = MediaCatalog::overwrite(status_path, &info, true)?; media_catalog = MediaCatalog::overwrite(status_path, &media_id, true)?;
} }
Some(media_set_label) => { Some(media_set_label) => {
if new_set.uuid == media_set_label.uuid { if new_set.uuid == media_set_label.uuid {
@ -378,11 +378,11 @@ fn drive_load_and_label_media(
tmp_drive.write_media_set_label(new_set)?; tmp_drive.write_media_set_label(new_set)?;
let info = MediaId { let media_id = MediaId {
label: info.label, label: media_id.label,
media_set_label: Some(new_set.clone()), media_set_label: Some(new_set.clone()),
}; };
media_catalog = MediaCatalog::overwrite(status_path, &info, true)?; media_catalog = MediaCatalog::overwrite(status_path, &media_id, true)?;
} }
} }
} }