From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 21 Jun 2012 20:33:03 +0000 (+0200)
Subject: Tweak Storage warning message for restore when StorageId not found
X-Git-Tag: Release-7.0.0~174
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ab485db41e6c335b7f0b7593dd83f5de006f9512;p=bacula%2Fbacula

Tweak Storage warning message for restore when StorageId not found
---

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 67f4f3fa72..ebc9b8437e 100644
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -1530,8 +1530,13 @@ void find_storage_resource(UAContext *ua, RESTORE_CTX &rx, char *Storage, char *
             if (acl_access_ok(ua, Storage_ACL, store->name())) {
                rx.store = store;
                Dmsg1(200, "Set store=%s\n", rx.store->name());
-               ua->warning_msg(_("Storage \"%s\" not found, using Storage \"%s\" from MediaType \"%s\".\n"),
-                  Storage, store->name(), MediaType);
+               if (Storage == NULL) {
+                  ua->warning(_("Using Storage \"%s\" from MediaType \"%s\".\n"),
+                     store->name(), MediaType);
+               } else {
+                  ua->warning_msg(_("Storage \"%s\" not found, using Storage \"%s\" from MediaType \"%s\".\n"),
+                     Storage, store->name(), MediaType);
+               }
             }
             UnlockRes();
             return;