From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 1 Nov 2012 19:40:40 +0000 (+0100)
Subject: Fix spooldata, accurate and ingnoreduplicate run argument
X-Git-Tag: Release-5.2.13~77
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ade1120c8d9767ea787a1a7679470d1acf2a8be5;p=bacula%2Fbacula

Fix spooldata, accurate and ingnoreduplicate run argument

When using "run accurate=yes job=MyJob yes", the job was not
using the accurate option. This is now fixed.
---

diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c
index e9c563d186..f66bdd572e 100644
--- a/bacula/src/dird/ua_run.c
+++ b/bacula/src/dird/ua_run.c
@@ -208,24 +208,6 @@ int modify_job_parameters(UAContext *ua, JCR *jcr, run_ctx &rc)
 {
    int i, opt;
    
-   /* Some options are not available through the menu
-    * TODO: Add an advanced menu?
-    */
-   if (rc.spool_data_set) {
-      jcr->spool_data = rc.spool_data;
-   }
-
-   if (rc.accurate_set) {
-      jcr->accurate = rc.accurate;
-   }
-
-   /* Used by migration jobs that can have the same name,
-    * but can run at the same time
-    */
-   if (rc.ignoreduplicatecheck_set) {
-      jcr->IgnoreDuplicateJobChecking = rc.ignoreduplicatecheck;
-   }
-
    /*
     * At user request modify parameters of job to be run.
     */
@@ -570,6 +552,25 @@ static bool reset_restore_context(UAContext *ua, JCR *jcr, run_ctx &rc)
       jcr->RestoreJobId = str_to_int64(rc.jid);
       rc.jid = 0;
    }
+
+   /* Some options are not available through the menu
+    * TODO: Add an advanced menu?
+    */
+   if (rc.spool_data_set) {
+      jcr->spool_data = rc.spool_data;
+   }
+
+   if (rc.accurate_set) {
+      jcr->accurate = rc.accurate;
+   }
+
+   /* Used by migration jobs that can have the same name,
+    * but can run at the same time
+    */
+   if (rc.ignoreduplicatecheck_set) {
+      jcr->IgnoreDuplicateJobChecking = rc.ignoreduplicatecheck;
+   }
+
    return true;
 }