From 5fd01fba511c143009dfb4dadffcdc5d8387cb9a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 10 Nov 2004 20:14:40 +0000 Subject: [PATCH] Save old mtx-changer before installing new one: bug 156 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1680 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/scripts/Makefile.in | 4 ++++ bacula/src/lib/lex.c | 3 ++- bacula/src/version.h | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bacula/scripts/Makefile.in b/bacula/scripts/Makefile.in index 69656cb22c..6be5b38fd6 100755 --- a/bacula/scripts/Makefile.in +++ b/bacula/scripts/Makefile.in @@ -37,6 +37,10 @@ install: installdirs $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula + @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ + echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ + $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old + fi $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c index afaaf98633..b3445d7f4e 100644 --- a/bacula/src/lib/lex.c +++ b/bacula/src/lib/lex.c @@ -135,8 +135,9 @@ LEX *lex_open_file(LEX *lf, const char *filename, LEX_ERROR_HANDLER *scan_error) if ((fd = fopen(fname, "r")) == NULL) { + berrno be; Emsg2(M_ERROR_TERM, 0, _("Cannot open config file %s: %s\n"), - fname, strerror(errno)); + fname, be.strerror()); return NULL; /* Never reached if exit_on_error == 1 */ } Dmsg1(2000, "Open config file: %s\n", fname); diff --git a/bacula/src/version.h b/bacula/src/version.h index add5a7cf71..99c81fd563 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -1,8 +1,8 @@ /* */ #undef VERSION #define VERSION "1.37.1" -#define BDATE "04 November 2004" -#define LSMDATE "04Nov04" +#define BDATE "10 November 2004" +#define LSMDATE "10Nov04" /* Debug flags */ #undef DEBUG -- 2.39.5