From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 27 Oct 2008 18:44:22 +0000 (+0000)
Subject: ebl  Update patch to not update the volume if media creation fails
X-Git-Tag: Release-2.4.4~54
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9476296299d066201738589533ef2d0f6d35d11e;p=bacula%2Fbacula

ebl  Update patch to not update the volume if media creation fails


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

diff --git a/bacula/patches/testing/2.4.3-update-slots.patch b/bacula/patches/testing/2.4.3-update-slots.patch
index bdb7832e70..0e019e3617 100644
--- a/bacula/patches/testing/2.4.3-update-slots.patch
+++ b/bacula/patches/testing/2.4.3-update-slots.patch
@@ -14,8 +14,8 @@
 
 Index: src/cats/sql_update.c
 ===================================================================
---- src/cats/sql_update.c	(révision 7854)
-+++ src/cats/sql_update.c	(copie de travail)
+--- src/cats/sql_update.c	(revision 7854)
++++ src/cats/sql_update.c	(working copy)
 @@ -445,14 +445,28 @@
  db_make_inchanger_unique(JCR *jcr, B_DB *mdb, MEDIA_DBR *mr)
  {
@@ -53,3 +53,27 @@ Index: src/cats/sql_update.c
     }
  }
  
+Index: src/cats/sql_create.c
+===================================================================
+--- src/cats/sql_create.c	(revision 7854)
++++ src/cats/sql_create.c	(working copy)
+@@ -459,14 +459,13 @@
+               "WHERE MediaId=%d", dt, mr->MediaId);
+          stat = UPDATE_DB(jcr, mdb, mdb->cmd);
+       }
++      /*
++       * Make sure that if InChanger is non-zero any other identical slot
++       *   has InChanger zero.
++       */
++      db_make_inchanger_unique(jcr, mdb, mr);
+    }
+ 
+-   /*
+-    * Make sure that if InChanger is non-zero any other identical slot
+-    *   has InChanger zero.
+-    */
+-   db_make_inchanger_unique(jcr, mdb, mr);
+-
+    db_unlock(mdb);
+    return stat;
+ }