[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] SF.net SVN: bacula: [6327]
From: ricozz () users ! sourceforge ! net
Date: 2008-01-26 22:01:47
Message-ID: E1JIt5v-0004eF-UC () sc8-pr-svn2 ! sourceforge ! net
[Download RAW message or body]
Revision: 6327
http://bacula.svn.sourceforge.net/bacula/?rev=6327&view=rev
Author: ricozz
Date: 2008-01-26 14:01:47 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
ebl fix execution condition
Modified Paths:
--------------
trunk/bacula/patches/testing/clientrunaftervss.patch
Modified: trunk/bacula/patches/testing/clientrunaftervss.patch
===================================================================
--- trunk/bacula/patches/testing/clientrunaftervss.patch 2008-01-26 21:53:54 UTC (rev \
6326)
+++ trunk/bacula/patches/testing/clientrunaftervss.patch 2008-01-26 22:01:47 UTC (rev \
6327) @@ -11,13 +11,53 @@
...
make install
-
-
+Index: src/dird/dird_conf.c
+===================================================================
+--- src/dird/dird_conf.c (r\xE9vision 6325)
++++ src/dird/dird_conf.c (copie de travail)
+@@ -1688,10 +1688,12 @@
+ *(int *)(item->value) = SCRIPT_Before ;
+ } else if (strcasecmp(lc->str, "after") == 0) {
+ *(int *)(item->value) = SCRIPT_After;
++ } else if (strcasecmp(lc->str, "aftervss") == 0) {
++ *(int *)(item->value) = SCRIPT_AfterVSS;
+ } else if (strcasecmp(lc->str, "always") == 0) {
+ *(int *)(item->value) = SCRIPT_Any;
+ } else {
+- scan_err2(lc, _("Expect %s, got: %s"), "Before, After or Always", lc->str);
++ scan_err2(lc, _("Expect %s, got: %s"), "Before, After, AfterVSS or Always", \
lc->str); + }
+ scan_to_eol(lc);
+ }
+Index: src/filed/job.c
+===================================================================
+--- src/filed/job.c (r\xE9vision 6325)
++++ src/filed/job.c (copie de travail)
+@@ -1445,6 +1445,7 @@
+ berrno be;
+ Jmsg(jcr, M_WARNING, 0, _("VSS was not initialized properly. VSS support \
is disabled. ERR=%s\n"), be.bstrerror()); + }
++ run_scripts(jcr, jcr->RunScripts, "ClientAfterVSS");
+ }
+ #endif
+
+Index: src/lib/runscript.h
+===================================================================
+--- src/lib/runscript.h (r\xE9vision 6325)
++++ src/lib/runscript.h (copie de travail)
+@@ -58,6 +58,7 @@
+ SCRIPT_Never = 0,
+ SCRIPT_After = (1<<0), /* AfterJob */
+ SCRIPT_Before = (1<<1), /* BeforeJob */
++ SCRIPT_AfterVSS = (1<<2), /* BeforeJob and After VSS */
+ SCRIPT_Any = SCRIPT_Before | SCRIPT_After
+ };
+
Index: src/lib/runscript.c
===================================================================
---- src/lib/runscript.c (r\xE9vision 5993)
+--- src/lib/runscript.c (r\xE9vision 6325)
+++ src/lib/runscript.c (copie de travail)
-@@ -108,6 +108,8 @@
+@@ -116,6 +116,8 @@
if (strstr(label, NT_("Before"))) {
when = SCRIPT_Before;
@@ -26,13 +66,12 @@
} else {
when = SCRIPT_After;
}
-@@ -134,6 +136,19 @@
+@@ -142,6 +144,18 @@
}
}
+ if ((script->when & SCRIPT_AfterVSS) && (when & SCRIPT_AfterVSS)) {
-+ if ((script->on_success
-+ && (jcr->JobStatus == JS_Running || jcr->JobStatus == JS_Created))
++ if ((script->on_success && (jcr->JobStatus == JS_Blocked))
+ || (script->on_failure && job_canceled(jcr))
+ )
+ {
@@ -46,45 +85,3 @@
if ((script->when & SCRIPT_After) && (when & SCRIPT_After)) {
if ((script->on_success && (jcr->JobStatus == JS_Terminated))
|| (script->on_failure && job_canceled(jcr))
-Index: src/lib/runscript.h
-===================================================================
---- src/lib/runscript.h (r\xE9vision 5993)
-+++ src/lib/runscript.h (copie de travail)
-@@ -56,6 +56,7 @@
- SCRIPT_Never = 0,
- SCRIPT_After = (1<<0), /* AfterJob */
- SCRIPT_Before = (1<<1), /* BeforeJob */
-+ SCRIPT_AfterVSS = (1<<2), /* BeforeJob and After VSS */
- SCRIPT_Any = SCRIPT_Before | SCRIPT_After
- };
-
-Index: src/filed/job.c
-===================================================================
---- src/filed/job.c (r\xE9vision 5993)
-+++ src/filed/job.c (copie de travail)
-@@ -1427,6 +1435,7 @@
- berrno be;
- Jmsg(jcr, M_WARNING, 0, _("VSS was not initialized properly. VSS support \
is disabled. ERR=%s\n"), be.bstrerror());
- }
-+ run_scripts(jcr, jcr->RunScripts, "ClientAfterVSS");
- }
- #endif
-
-Index: src/dird/dird_conf.c
-===================================================================
---- src/dird/dird_conf.c (r\xE9vision 5993)
-+++ src/dird/dird_conf.c (copie de travail)
-@@ -1682,10 +1682,12 @@
- *(int *)(item->value) = SCRIPT_Before ;
- } else if (strcasecmp(lc->str, "after") == 0) {
- *(int *)(item->value) = SCRIPT_After;
-+ } else if (strcasecmp(lc->str, "aftervss") == 0) {
-+ *(int *)(item->value) = SCRIPT_AfterVSS;
- } else if (strcasecmp(lc->str, "always") == 0) {
- *(int *)(item->value) = SCRIPT_Any;
- } else {
-- scan_err2(lc, _("Expect %s, got: %s"), "Before, After or Always", lc->str);
-+ scan_err2(lc, _("Expect %s, got: %s"), "Before, After, AfterVSS or Always", \
lc->str);
- }
- scan_to_eol(lc);
- }
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic