- Implement using pg_config for finding PostgreSQL files.

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

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 46adb0c1a70a0cdd2c45bf30d542287b9b28386b..ac8f8f0ac0b70821592fab6c69ca0f42d3572549 100644 (file)
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -127,7 +127,7 @@ bool do_migration(JCR *jcr)
    JCR *prev_jcr;
 
    if (jcr->previous_jr.JobId == 0) {
-      jcr->JobStatus = JS_Terminated;
+      set_jcr_job_status(jcr, JS_Terminated);
       migration_cleanup(jcr, jcr->JobStatus);
       return true;                    /* no work */
    }
@@ -287,7 +287,7 @@ bool do_migration(JCR *jcr)
    /* Note, the SD stores in jcr->JobFiles/ReadBytes/JobBytes/Errors */
    wait_for_storage_daemon_termination(jcr);
 
-   jcr->JobStatus = jcr->SDJobStatus;
+   set_jcr_job_status(jcr, jcr->SDJobStatus);
    if (jcr->JobStatus == JS_Terminated) {
       migration_cleanup(jcr, jcr->JobStatus);
       return true;
@@ -449,8 +449,8 @@ static bool get_job_to_migrate(JCR *jcr)
             const int nmatch = 30;
             regmatch_t pmatch[nmatch];
             if (last_item) {
-               free(last_item->item);
                Dmsg1(000, "Remove item %s\n", last_item->item);
+               free(last_item->item);
                item_chain->remove(last_item);
             }
             Dmsg1(000, "Jobitem=%s\n", item->item);