*
*/
/*
- Copyright (C) 2000-2006 Kern Sibbald
+ Bacula® - The Network Backup Solution
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
+ Copyright (C) 2006-2006 Free Software Foundation Europe e.V.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation plus additions
+ that are listed in the file LICENSE.
- */
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
#include "bacula.h"
on_failure = false;
abort_on_error = true;
when = SCRIPT_Never;
+ old_proto = false; /* TODO: drop this with bacula 1.42 */
}
RUNSCRIPT *copy_runscript(RUNSCRIPT *src)
script->on_success,
script->on_failure,
jcr->JobStatus );
- script->when ^= SCRIPT_After; /* reset SCRIPT_After bit */
runit = true;
}
}
/* 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);
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;
}
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;