From e8bd86af6a7f084a9e390c8f85b6d39998281d51 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 13 Nov 2005 21:51:44 +0000 Subject: [PATCH] Make sure to set storage before trying to set drive. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2585 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/ua_cmds.c | 1 - bacula/src/dird/ua_label.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index 127f5a5299..734943bb49 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -1263,7 +1263,6 @@ static void do_mount_cmd(UAContext *ua, const char *command) return; } set_storage(jcr, store); - drive = get_storage_drive(ua, store); Dmsg3(120, "Found storage, MediaType=%s DevName=%s drive=%d\n", diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c index 88f2794a5b..384315b694 100644 --- a/bacula/src/dird/ua_label.c +++ b/bacula/src/dird/ua_label.c @@ -165,8 +165,8 @@ int update_slots(UAContext *ua) if (!store) { return 1; } - drive = get_storage_drive(ua, store); set_storage(ua->jcr, store); + drive = get_storage_drive(ua, store); scan = find_arg(ua, N_("scan")) >= 0; @@ -309,8 +309,8 @@ static int do_label(UAContext *ua, const char *cmd, int relabel) if (!store) { return 1; } - drive = get_storage_drive(ua, store); set_storage(ua->jcr, store); + drive = get_storage_drive(ua, store); if (label_barcodes) { label_from_barcodes(ua, drive); -- 2.39.5