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

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 127f5a52994ba524dec6ee665f0b0e774ade2e14..734943bb497642b17415d9f9c9dcf4ea4784f41d 100644 (file)
--- 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 88f2794a5b134674c82ec4e5af1953b980a635aa..384315b694e3bb30b42d0a3aadb2009904f1b4d1 100644 (file)
--- 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);