From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 19 Jun 2008 15:24:12 +0000 (+0000)
Subject: ebl  update
X-Git-Tag: Release-7.0.0~4431
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b5469c15c503a1d4d5617f7c80244686f909d21c;p=bacula%2Fbacula

ebl  update


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7177 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/patches/testing/cleanup_CR_catalog_at_start.patch b/bacula/patches/testing/cleanup_CR_catalog_at_start.patch
index 3bd56106c2..95f98e6fdf 100644
--- a/bacula/patches/testing/cleanup_CR_catalog_at_start.patch
+++ b/bacula/patches/testing/cleanup_CR_catalog_at_start.patch
@@ -13,7 +13,7 @@ This avoid phantom jobs with bweb or bat.
 
 Index: src/dird/dird.c
 ===================================================================
---- src/dird/dird.c	(revision 7173)
+--- src/dird/dird.c	(revision 7176)
 +++ src/dird/dird.c	(working copy)
 @@ -40,6 +40,7 @@
  /* Forward referenced subroutines */
@@ -73,7 +73,7 @@ Index: src/dird/dird.c
     bool OK = true;
 Index: src/cats/sql_update.c
 ===================================================================
---- src/cats/sql_update.c	(revision 7173)
+--- src/cats/sql_update.c	(revision 7176)
 +++ src/cats/sql_update.c	(working copy)
 @@ -288,6 +288,18 @@
  }
@@ -82,10 +82,10 @@ Index: src/cats/sql_update.c
 +db_cleanup_job_record(JCR *jcr, B_DB *mdb)
 +{
 +   int stat;
-+   char query[] = "UPDATE Job SET JobStatus = 'f' WHERE JobStatus IN ('R', 'C')";
++   char query[] = "UPDATE Job SET JobStatus = 'f', EndTime = NOW() WHERE JobStatus IN ('R', 'C')";
 +
 +   db_lock(mdb);
-+   stat = UPDATE_DB(jcr, mdb, mdb->cmd);
++   stat = UPDATE_DB(jcr, mdb, query);
 +   db_unlock(mdb);
 +   return stat;
 +}
@@ -96,7 +96,7 @@ Index: src/cats/sql_update.c
     int stat;
 Index: src/cats/protos.h
 ===================================================================
---- src/cats/protos.h	(revision 7173)
+--- src/cats/protos.h	(revision 7176)
 +++ src/cats/protos.h	(working copy)
 @@ -123,6 +123,7 @@
  void db_list_client_records(JCR *jcr, B_DB *mdb, DB_LIST_HANDLER *sendit, void *ctx, e_list_type type);