- Implement Python in the SD (no events yet though).

- Fix some typos in the previous commit.

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

diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in
index c073cc3b47f6da5a4df12039638ab77dfe5c4b56..d8444df14641558dbe5dc3dc656512c1d4f96c65 100644 (file)
--- a/bacula/autoconf/Make.common.in
+++ b/bacula/autoconf/Make.common.in
@@ -58,6 +58,8 @@ LIBS = @LIBS@
 DINCLUDE = @DINCLUDE@
 DLIB = @DLIB@
 DB_LIBS = @DB_LIBS@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_INC = @PYTHON_INCDIR@
 
 # Windows (cygwin) flags 
 WCFLAGS = @WCFLAGS@

diff --git a/bacula/examples/python/EndJob.py b/bacula/examples/python/EndJob.py
index 00a9247a799658c90507509aae5630e5b522cff3..7624766f317196281b50ee18c51ed24b9ff6be18 100644 (file)
--- a/bacula/examples/python/EndJob.py
+++ b/bacula/examples/python/EndJob.py
@@ -3,7 +3,7 @@ import bacula
 def EndJob(j):
     jobid = bacula.get(j, "JobId")
     client = bacula.get(j, "Client") 
-    bacula.set(jcr=j, JobReport="Python JndJob output: JobId=%d Client=%s.\n" % (jobid, client))
+    bacula.set(jcr=j, JobReport="Python JodJob output: JobId=%d Client=%s.\n" % (jobid, client))
     if (jobid < 5) :
        startid = bacula.run(j, "run kernsave")
        print "Python started jobid=", startid

diff --git a/bacula/src/dird/python.c b/bacula/src/dird/python.c
index ba1562c148f1460095c8942e233a64f34e3d33be..882e1ae23668968c60472cdd7db7cb1dbae2ee7d 100644 (file)
--- a/bacula/src/dird/python.c
+++ b/bacula/src/dird/python.c
@@ -36,8 +36,6 @@
 #undef _POSIX_C_SOURCE
 #include <Python.h>
 
-bool run_module(const char *module);
-
 PyObject *bacula_get(PyObject *self, PyObject *args);
 PyObject *bacula_set(PyObject *self, PyObject *args, PyObject *keyw);
 PyObject *bacula_run(PyObject *self, PyObject *args);
@@ -46,7 +44,7 @@ PyObject *bacula_run(PyObject *self, PyObject *args);
 PyMethodDef BaculaMethods[] = {
     {"get", bacula_get, METH_VARARGS, "Get Bacula variables."},
     {"set", (PyCFunction)bacula_set, METH_VARARGS|METH_KEYWORDS,
-       "Set Bacula variables."},
+        "Set Bacula variables."},
     {"run", (PyCFunction)bacula_run, METH_VARARGS, "Run a Bacula command."},
     {NULL, NULL, 0, NULL}            /* last item */
 };

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 506f4517d5cd6ddd29e21c7fd961a3b2b9874b39..3b516bef6b13f56d19531986d8bcab454542453c 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -471,8 +471,8 @@ static int run_cmd(JCR *jcr, char *cmd, const char *name)
    }
    while (fgets(line, sizeof(line), bpipe->rfd)) {
       int len = strlen(line);
-      if (len > 0 && line[len-1] ! = '\n') {
-         bstrncat(line, sizeof(line), "\n");
+      if (len > 0 && line[len-1] != '\n') {
+         bstrncat(line, "\n", sizeof(line));
       }
       Jmsg(jcr, M_INFO, 0, _("%s: %s"), name, line);
    }

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index cccbc58ce906f2fc0d4524ac28480c62c7a15cde..cbdfa2292fd014ac6d3ee1cf8d6d814fc93e72ab 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -23,6 +23,7 @@ SVRSRCS = stored.c autochanger.c acquire.c append.c \
          block.c butil.c dev.c \
          device.c dircmd.c fd_cmds.c job.c \
          label.c match_bsr.c mount.c parse_bsr.c \
+         python.c \
          read.c read_record.c record.c \
          spool.c status.c stored_conf.c
 SVROBJS = stored.o autochanger.o acquire.o append.o \
@@ -30,6 +31,7 @@ SVROBJS = stored.o autochanger.o acquire.o append.o \
          block.o butil.o dev.o \
          device.o dircmd.o fd_cmds.o job.o \
          label.o match_bsr.o mount.o parse_bsr.o \
+         python.o \
          read.o read_record.o record.o \
          spool.o status.o stored_conf.o
 
@@ -75,7 +77,7 @@ FDLIBS=@FDLIBS@
 
 # inference rules
 .c.o:
-       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 
 all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
@@ -83,10 +85,12 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
        @echo " "
 
 bacula-sd: $(SVROBJS) ../lib/libbac.a
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(DLIB) $(LIBS) 
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
+         -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) 
 
 static-bacula-sd: $(SVROBJS) ../lib/libbac.a
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) -lbac -lm $(DLIB) $(LIBS) 
+       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
+         -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) 
        strip $@
 
 btape.o: btape.c
@@ -178,7 +182,7 @@ depend:
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
        @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 2479a4062447a1999ed02202ffb1c4eda0cafda4..28bed4bc23aef4e0b24713f84b36767bec809b7e 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.1"
-#define BDATE   "30 December 2004"
-#define LSMDATE "30Dec04"
+#define BDATE   "01 January 2005"
+#define LSMDATE "01Jan05"
 
 /* Debug flags */
 #undef  DEBUG