Fix line I accidently truncated

[bacula/bacula] / bacula / src / dird / backup.c

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 8df126a9f090ac1d953fef6f8545dddcba6b2d1d..480a5918fb56d9fc9a1634b0aa8ba057be15960b 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -16,7 +16,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -171,15 +171,19 @@ bool do_backup(JCR *jcr)
    set_jcr_job_status(jcr, JS_Running);
    fd = jcr->file_bsock;
 
-   if (!send_include_list(jcr)) {
+   if (!send_level_command(jcr)) {
       goto bail_out;
    }
 
-   if (!send_exclude_list(jcr)) {
+   if (!send_runscripts_commands(jcr)) {
       goto bail_out;
    }
 
-   if (!send_level_command(jcr)) {
+   if (!send_include_list(jcr)) {
+      goto bail_out;
+   }
+
+   if (!send_exclude_list(jcr)) {
       goto bail_out;
    }
 
@@ -205,10 +209,6 @@ 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 
@@ -233,6 +233,9 @@ bool do_backup(JCR *jcr)
 
    /* Pickup Job termination data */
    stat = wait_for_job_termination(jcr);
+#ifdef HAVE_BATCH_FILE_INSERT
+   db_create_batch_file_record(jcr);   /* used by bulk batch file insert */
+#endif
    if (stat == JS_Terminated) {
       backup_cleanup(jcr, stat);
       return true;