From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 20 Feb 2007 13:38:43 +0000 (+0000)
Subject: ebl  Revert ClientRunBeforeJob as it was in 1.38.x
X-Git-Tag: Release-2.0.3~30
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ca418b025a8f2ca35e16cacee42fe3ef189a041;p=bacula%2Fbacula

ebl  Revert ClientRunBeforeJob as it was in 1.38.x
     You can't use them to generate Include/Exclude list


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

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 8b9dfd8db2..24b29d3384 100644
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -171,19 +171,15 @@ bool do_backup(JCR *jcr)
    set_jcr_job_status(jcr, JS_Running);
    fd = jcr->file_bsock;
 
-   if (!send_level_command(jcr)) {
-      goto bail_out;
-   }
-
-   if (!send_runscripts_commands(jcr)) {
+   if (!send_include_list(jcr)) {
       goto bail_out;
    }
 
-   if (!send_include_list(jcr)) {
+   if (!send_exclude_list(jcr)) {
       goto bail_out;
    }
 
-   if (!send_exclude_list(jcr)) {
+   if (!send_level_command(jcr)) {
       goto bail_out;
    }
 
@@ -209,6 +205,10 @@ bool do_backup(JCR *jcr)
       goto bail_out;
    }
 
+   if (!send_runscripts_commands(jcr)) {
+      goto bail_out;
+   }
+
    /*    
     * We re-update the job start record so that the start
     *  time is set after the run before job.  This avoids