ebl add sql_escape to catalog messages

[bacula/bacula] / bacula / src / lib / runscript.c

diff --git a/bacula/src/lib/runscript.c b/bacula/src/lib/runscript.c
index aeb99c4e8ef7ec416b77f7136970ada885b9f847..e19d246f267400ee902172aba0d62ae14d8381f3 100644 (file)
--- a/bacula/src/lib/runscript.c
+++ b/bacula/src/lib/runscript.c
@@ -136,7 +136,7 @@ int run_scripts(JCR *jcr, alist *runscripts, const char *label)
         /* cancel running job properly */
         if (   script->abort_on_error 
             && (status == false) 
-            && (jcr->JobStatus == JS_Created)
+            && (jcr->JobStatus == JS_Created || jcr->JobStatus == JS_Running)
            )
         {
            set_jcr_job_status(jcr, JS_ErrorTerminated);
@@ -203,7 +203,7 @@ int RUNSCRIPT::run(JCR *jcr, const char *name)
    free_pool_memory(ecmd);
    if (bpipe == NULL) {
       berrno be;
-      Jmsg(jcr, M_FATAL, 0, _("%s could not execute. ERR=%s\n"), name,
+      Jmsg(jcr, M_ERROR, 0, _("Runscript: %s could not execute. ERR=%s\n"), name,
          be.strerror());
       return false;
    }
@@ -217,8 +217,8 @@ int RUNSCRIPT::run(JCR *jcr, const char *name)
    status = close_bpipe(bpipe);
    if (status != 0) {
       berrno be;
-      Jmsg(jcr, M_FATAL, 0, _("%s returned non-zero status=%d. ERR=%s\n"), name,
-         status, be.strerror(status));
+      Jmsg(jcr, M_ERROR, 0, _("Runscript: %s returned non-zero status=%d. ERR=%s\n"), name,
+         be.code(status), be.strerror(status));
       return false;
    }
    return true;