From f9b08c13cda251f8db0324dbedc7031bd5d1836d Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Mon, 30 Nov 2015 20:38:50 +0100 Subject: [PATCH 1/2] Fix typo. Fixes #574: typo in configure script (jansson) --- autoconf/configure.in | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoconf/configure.in b/autoconf/configure.in index f03819fa965..6f96daea424 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -3129,7 +3129,7 @@ if test "x${with_jansson_directory}" != "xyes" && test x"${with_jansson_director else if test x$with_jansson_directory = xyes || test x"${with_jansson_directory}" = "x" && $PKGCONFIG jansson; then have_jansson=yes - JANSSON_INC=`$PKGCONFIG --cflags janson` + JANSSON_INC=`$PKGCONFIG --cflags jansson` JANSSON_LIBS=`$PKGCONFIG --libs jansson` fi fi diff --git a/configure b/configure index 450db5441e6..f6390d08416 100755 --- a/configure +++ b/configure @@ -30684,7 +30684,7 @@ if test "x${with_jansson_directory}" != "xyes" && test x"${with_jansson_director else if test x$with_jansson_directory = xyes || test x"${with_jansson_directory}" = "x" && $PKGCONFIG jansson; then have_jansson=yes - JANSSON_INC=`$PKGCONFIG --cflags janson` + JANSSON_INC=`$PKGCONFIG --cflags jansson` JANSSON_LIBS=`$PKGCONFIG --libs jansson` fi fi From fb775025d54ef77abb4d67cc5aa9ecb90bca4839 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Thu, 3 Dec 2015 09:20:47 +0100 Subject: [PATCH 2/2] Replace break; with exit. Seems I was thinking to much I was programming C instead of shell. --- src/cats/update_bareos_tables.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cats/update_bareos_tables.in b/src/cats/update_bareos_tables.in index bb9255cf156..0d5a95f1d03 100644 --- a/src/cats/update_bareos_tables.in +++ b/src/cats/update_bareos_tables.in @@ -170,7 +170,7 @@ do if [ ${retval} != 0 ]; then echo "Failed to upgrade database schema from version ${start_version} to ${end_version}" - break; + exit ${retval} fi done