From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 9 Feb 2010 18:13:52 +0000 (+0100)
Subject: Probable fix for Copy/Migration bug #1476
X-Git-Tag: Release-7.0.0~2249
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=29fdbbfd8a9a628c83dfecc2ee0b1afb8c51631c;p=bacula%2Fbacula

Probable fix for Copy/Migration bug #1476
---

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index f1d61df020..875386102d 100644
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -317,7 +317,8 @@ bool do_migration(JCR *jcr)
       return true;
    }
    /* Make sure this job was not already migrated */
-   if (jcr->previous_jr.JobType != JT_BACKUP) {
+   if (jcr->previous_jr.JobType != JT_BACKUP &&
+       jcr->previous_jr.JobType != JT_COPY) {
       Jmsg(jcr, M_INFO, 0, _("JobId %s already %s probably by another Job. %s stopped.\n"),
          edit_int64(jcr->previous_jr.JobId, ed1),
          jcr->get_ActionName(1),
@@ -1185,7 +1186,7 @@ void migration_cleanup(JCR *jcr, int TermCode)
       } 
 
       /*
-       * If we terminated a copy normally:
+       * If we terminated a Copy (rather than a Migration) normally:
        *   - copy any Log records to the new JobId
        *   - set type="Job Copy" for the new job
        */