From 3edcb80906812d5d63db444701039a81a1788ae5 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 22 Jun 2005 19:59:33 +0000 Subject: [PATCH] - Make Version a tuple (version, build-date) - Add CatalogRes tuple (DbName, Address, User, Password, Socket, Port) git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2162 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kes-1.37 | 3 +++ bacula/src/dird/pythondir.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bacula/kes-1.37 b/bacula/kes-1.37 index 00364c6c7d..a1354e431d 100644 --- a/bacula/kes-1.37 +++ b/bacula/kes-1.37 @@ -5,6 +5,9 @@ General: Changes to 1.37.26: 22Jun05: +- Make Version a tuple (version, build-date) +- Add CatalogRes tuple (DbName, Address, User, Password, + Socket, Port) - Add Version, ConfigDir, and WorkingDir as Python attributes in the Director. - Implement code (principally for Win32) that on failure to diff --git a/bacula/src/dird/pythondir.c b/bacula/src/dird/pythondir.c index f192f90b97..749d4b922b 100644 --- a/bacula/src/dird/pythondir.c +++ b/bacula/src/dird/pythondir.c @@ -70,9 +70,10 @@ static struct s_vars getvars[] = { { N_("JobName"), "s"}, { N_("JobStatus"), "s"}, { N_("Priority"), "i"}, - { N_("Version"), "s"}, + { N_("Version"), "(ss)"}, { N_("ConfigFile"), "s"}, { N_("WorkingDir"), "s"}, + { N_("CatalogRes"), "(sssssi)"}, { NULL, NULL} }; @@ -147,11 +148,17 @@ PyObject *job_getattr(PyObject *self, char *attrname) case 13: /* Priority */ return Py_BuildValue(getvars[i].fmt, jcr->JobPriority); case 14: /* Version */ - return Py_BuildValue(getvars[i].fmt, VERSION); + return Py_BuildValue(getvars[i].fmt, VERSION, BDATE); case 15: /* Config Dir */ return Py_BuildValue(getvars[i].fmt, configfile); case 16: /* Working Dir */ return Py_BuildValue(getvars[i].fmt, director->working_directory); + case 17: /* CatalogRes */ + return Py_BuildValue(getvars[i].fmt, + jcr->catalog->db_name, jcr->catalog->db_address, + jcr->catalog->db_user, jcr->catalog->db_password, + jcr->catalog->db_socket, jcr->catalog->db_port); + } bsnprintf(errmsg, sizeof(errmsg), "Attribute %s not found.", attrname); bail_out: -- 2.39.5