-/*
- *
- * Bacula common code library interface to Python
- *
- * Kern Sibbald, November MMIV
- *
- * Version $Id$
- *
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
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.
+ License as published by the Free Software Foundation and included
+ 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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ *
+ * Bacula common code library interface to Python
+ *
+ * Kern Sibbald, November MMIV
+ *
+ * Version $Id$
+ *
+ */
#include "bacula.h"
#include "jcr.h"
PyObject *pJob;
int stat = -1;
PyObject *result = NULL;
+ char *obj_fmt = (char *)"O";
if (!StartUp_module) {
Dmsg0(100, "No startup module.\n");
}
((JobObject *)pJob)->jcr = jcr;
bstrncpy(jcr->event, event, sizeof(jcr->event));
- result = PyObject_CallFunction(JobStart_method, "O", pJob);
+ result = PyObject_CallFunction(JobStart_method, obj_fmt, pJob);
jcr->event[0] = 0; /* no event in progress */
if (result == NULL) {
JobStart_method = NULL;
}
bstrncpy(jcr->event, event, sizeof(jcr->event));
Dmsg1(100, "Call daemon event=%s\n", event);
- result = PyObject_CallFunction(JobEnd_method, "O", jcr->Python_job);
+ result = PyObject_CallFunction(JobEnd_method, obj_fmt, jcr->Python_job);
jcr->event[0] = 0; /* no event in progress */
if (result == NULL) {
if (PyErr_Occurred()) {
if ((errstat=rwl_init(&python_rwlock)) != 0) {
berrno be;
Emsg1(M_ABORT, 0, _("Unable to initialize the Python lock. ERR=%s\n"),
- be.strerror(errstat));
+ be.bstrerror(errstat));
}
}
if ((errstat=rwl_writelock(&python_rwlock)) != 0) {
berrno be;
Emsg2(M_ABORT, 0, "Python rwl_writelock failure. stat=%d: ERR=%s\n",
- errstat, be.strerror(errstat));
+ errstat, be.bstrerror(errstat));
}
}
if ((errstat=rwl_writeunlock(&python_rwlock)) != 0) {
berrno be;
Emsg2(M_ABORT, 0, "Python rwl_writeunlock failure. stat=%d: ERR=%s\n",
- errstat, be.strerror(errstat));
+ errstat, be.bstrerror(errstat));
}
}