From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 8 Jan 2010 20:03:32 +0000 (+0100)
Subject: Remove old code requiring different storages for migration
X-Git-Tag: Release-5.0.0~90
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1ce0b8ab0b1c95940ad1b099e083e95da03c2543;p=bacula%2Fbacula

Remove old code requiring different storages for migration
---

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index 59dcdc26ad..f1d61df020 100644
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -353,11 +353,7 @@ bool do_migration(JCR *jcr)
    Dmsg2(dbglevel, "Read store=%s, write store=%s\n", 
       ((STORE *)jcr->rstorage->first())->name(),
       ((STORE *)jcr->wstorage->first())->name());
-   if (((STORE *)jcr->rstorage->first())->name() == ((STORE *)jcr->wstorage->first())->name()) {
-      Jmsg(jcr, M_FATAL, 0, _("Read storage \"%s\" same as write storage.\n"),
-           ((STORE *)jcr->rstorage->first())->name());
-      return false;
-   }
+
    if (!start_storage_daemon_job(jcr, jcr->rstorage, jcr->wstorage, /*send_bsr*/true)) {
       return false;
    }
diff --git a/bacula/src/dird/vbackup.c b/bacula/src/dird/vbackup.c
index e75d08d06c..75869419d3 100644
--- a/bacula/src/dird/vbackup.c
+++ b/bacula/src/dird/vbackup.c
@@ -141,14 +141,6 @@ bool do_vbackup(JCR *jcr)
    Dmsg2(100, "Read store=%s, write store=%s\n", 
       ((STORE *)jcr->rstorage->first())->name(),
       ((STORE *)jcr->wstorage->first())->name());
-   /* ***FIXME***  we really should simply verify that the pools are different */
-#ifdef xxx
-   if (((STORE *)jcr->rstorage->first())->name() == ((STORE *)jcr->wstorage->first())->name()) {
-      Jmsg(jcr, M_FATAL, 0, _("Read storage \"%s\" same as write storage.\n"),
-           ((STORE *)jcr->rstorage->first())->name());
-      return false;
-   }
-#endif
 
    /* Print Job Start message */
    Jmsg(jcr, M_INFO, 0, _("Start Virtual Backup JobId %s, Job=%s\n"),
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 7e9259bcad..e70d3e494c 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 
 #undef  VERSION
 #define VERSION "3.1.8"
-#define BDATE   "01 January 2010"
-#define LSMDATE "01Jan10"
+#define BDATE   "08 January 2010"
+#define LSMDATE "08Jan10"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2010 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2010"       /* year for copyright messages in progs */
diff --git a/bacula/technotes b/bacula/technotes
index 1ef81e81b0..18319d3887 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,9 @@
           
 General:
 
+08Jan10
+kes  Remove requirement for different storages for migrate, something
+     forgotten, but reminded by Jim Barber.
 06Jan10
 ebl  Add make_catalog_backup.pl script that uses env variables and
      disk file to pass database password for backup