ebl Fix #1031 about wrong pool source information in job report.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6390 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/patches/2.2.8-pool-source.patch b/bacula/patches/2.2.8-pool-source.patch
new file mode 100644 (file)
index 0000000..347dcce
--- /dev/null
+++ b/bacula/patches/2.2.8-pool-source.patch
@@ -0,0 +1,29 @@
+
+ This patch fixes bug #1031 about wrong pool source information
+ in job report.
+
+ Apply the patch to 2.2.8 (and possibly any 2.2.x version with):
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-pool-source.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+
+Index: src/dird/ua_run.c
+===================================================================
+--- src/dird/ua_run.c  (révision 6388)
++++ src/dird/ua_run.c  (copie de travail)
+@@ -122,6 +122,9 @@
+    jcr->verify_job = rc.verify_job;
+    jcr->previous_job = rc.previous_job;
+    jcr->pool = rc.pool;
++   if (jcr->pool != jcr->job->pool) {
++      pm_strcpy(jcr->pool_source, _("User input"));
++   }
+    set_rwstorage(jcr, rc.store);
+    jcr->client = rc.client;
+    pm_strcpy(jcr->client_name, rc.client->name());

diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c
index e90bfda084582f90e5cee758f59d62d71e81f934..a97b90f9c5ef65e7b71f7fd6b12479845d14e1ae 100644 (file)
--- a/bacula/src/dird/ua_run.c
+++ b/bacula/src/dird/ua_run.c
@@ -122,6 +122,9 @@ try_again:
    jcr->verify_job = rc.verify_job;
    jcr->previous_job = rc.previous_job;
    jcr->pool = rc.pool;
+   if (jcr->pool != jcr->job->pool) {
+      pm_strcpy(jcr->pool_source, _("User input"));
+   }
    set_rwstorage(jcr, rc.store);
    jcr->client = rc.client;
    pm_strcpy(jcr->client_name, rc.client->name());

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 585a3d8868a5d6ee5d3361e89df452f0325a30c6..af7833827688d687255bbb1fd510cadc956f12f3 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.2
 
 General:
+10Feb08
+ebl  Apply patch to corrent bug #1031, about wrong pool source information
+     in job report.
+
 Release Version 2.2.8
 25Jan08
 kes  Apply patch from Martin to correct bug #1040, bscan sets existing