- Fix non-python prototypes in dummy routines.

- Add python 2.3 to config search list (user submitted patch)
- Add JobStatus to Python variables.

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

diff --git a/bacula/src/dird/python.c b/bacula/src/dird/python.c
index bda706e664c3e10b5fa79278ceb7e19ccd69ece9..d539bd4fa6162a135230c987b78b0d0ab3a5c3e2 100644 (file)
--- a/bacula/src/dird/python.c
+++ b/bacula/src/dird/python.c
@@ -67,6 +67,7 @@ static struct s_vars vars[] = {
    { N_("Catalog"),    "s"},
    { N_("MediaType"),  "s"},
    { N_("JobName"),    "s"},
    { N_("Catalog"),    "s"},
    { N_("MediaType"),  "s"},
    { N_("JobName"),    "s"},

+   { N_("JobStatus"),  "s"},

    
    { NULL,            NULL}
 };
    
    { NULL,            NULL}
 };


@@ -79,6 +80,7 @@ PyObject *bacula_get(PyObject *self, PyObject *args)
    char *item;
    bool found = false;
    int i;
    char *item;
    bool found = false;
    int i;

+   char buf[10];

 
    if (!PyArg_ParseTuple(args, "Os:get", &CObject, &item)) {
       return NULL;
 
    if (!PyArg_ParseTuple(args, "Os:get", &CObject, &item)) {
       return NULL;


@@ -118,6 +120,10 @@ PyObject *bacula_get(PyObject *self, PyObject *args)
       return Py_BuildValue(vars[i].fmt, jcr->store->media_type);
    case 11:                          /* JobName */
       return Py_BuildValue(vars[i].fmt, jcr->Job);
       return Py_BuildValue(vars[i].fmt, jcr->store->media_type);
    case 11:                          /* JobName */
       return Py_BuildValue(vars[i].fmt, jcr->Job);

+   case 12:                          /* JobStatus */
+      buf[1] = 0;
+      buf[0] = jcr->JobStatus;
+      return Py_BuildValue(vars[i].fmt, buf);

    }
    return NULL;
 }
    }
    return NULL;
 }

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 32f9d0afabfcec6d95b068c836477e819c469531..b2c499aadb9aade883ce364288dca6ac5a509060 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -547,9 +547,6 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
            } else {
                str = "*none*";
            }
            } else {
                str = "*none*";
            }

-           if (!str) {
-               str = "";
-           }

            break;
          case 'd':
             str = my_name;            /* Director's name */
            break;
          case 'd':
             str = my_name;            /* Director's name */

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 6d5067be97802ab98647eed29f6c267ec0023d02..10d0c573da5f291ec565c2f38e583161827b848a 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.1"
 /* */
 #undef  VERSION
 #define VERSION "1.37.1"

-#define BDATE   "29 November 2004"
-#define LSMDATE "29Nov04"
+#define BDATE   "01 December 2004"
+#define LSMDATE "01Dec04"

 
 /* Debug flags */
 #undef  DEBUG
 
 /* Debug flags */
 #undef  DEBUG