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

diff --git a/bacula/scripts/Makefile.in b/bacula/scripts/Makefile.in
index 69656cb22c800a631ccda22cbc96184fc718d152..6be5b38fd61b3ffeb5d70b69758583bb9bb9b65a 100755 (executable)
--- 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 afaaf98633b29f788b96f3b4367ba0dd6d690df6..b3445d7f4ed20cce60c715c68e1474b0c10b7de8 100644 (file)
--- 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 add5a7cf71d08f87927e8b3dda79eccf722949cc..99c81fd563a8b404bc396f7c5f5f17f8745e2afb 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   "04 November 2004"
-#define LSMDATE "04Nov04"
+#define BDATE   "10 November 2004"
+#define LSMDATE "10Nov04"
 
 /* Debug flags */
 #undef  DEBUG