[Bacula-commits] [bacula.org] Bacula Community source branch Branch-5.2 updated. 2514f03f5cd1a8a668407b6e969cb8e01de86acd

[<gi...@ba...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".

The branch, Branch-5.2 has been updated
       via  2514f03f5cd1a8a668407b6e969cb8e01de86acd (commit)
       via  744f25a5f5db042e32c7aed9804725c51db5a051 (commit)
      from  42ac34b3e42452cd3fd9f9290cd9746501f7e41a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2514f03f5cd1a8a668407b6e969cb8e01de86acd
Author: Kern Sibbald <ke...@si...>
Date:   Thu Jun 21 22:33:03 2012 +0200

    Tweak Storage warning message for restore when StorageId not found

commit 744f25a5f5db042e32c7aed9804725c51db5a051
Author: Eric Bollengier <er...@ba...>
Date:   Mon Jun 4 18:12:37 2012 +0200

    Send level before the fileset in estimate_cmd() like in backup()

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index c86f1ab..603990e 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1206,16 +1206,6 @@ static int estimate_cmd(UAContext *ua, const char *cmd)
       return 1;
    }
 
-   if (!send_include_list(jcr)) {
-      ua->error_msg(_("Error sending include list.\n"));
-      goto bail_out;
-   }
-
-   if (!send_exclude_list(jcr)) {
-      ua->error_msg(_("Error sending exclude list.\n"));
-      goto bail_out;
-   }
-
    /* The level string change if accurate mode is enabled */
    if (accurate >= 0) {
       jcr->accurate = accurate;
@@ -1227,6 +1217,16 @@ static int estimate_cmd(UAContext *ua, const char *cmd)
       goto bail_out;
    }
 
+   if (!send_include_list(jcr)) {
+      ua->error_msg(_("Error sending include list.\n"));
+      goto bail_out;
+   }
+
+   if (!send_exclude_list(jcr)) {
+      ua->error_msg(_("Error sending exclude list.\n"));
+      goto bail_out;
+   }
+
    /*
     * If the job is in accurate mode, we send the list of
     * all files to FD.
diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 67f4f3f..ebc9b84 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;


hooks/post-receive
-- 
Bacula Community source