From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 8 Jun 2020 11:14:50 +0000 (+0200)
Subject: Fix org#2487 Get working directory from dbcheck in make_catalog_backup.pl
X-Git-Tag: Release-9.6.4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=170a5fdadcda88615aa6449ad1cba8ff77999d38;p=thirdparty%2Fbacula.git

Fix org#2487 Get working directory from dbcheck in make_catalog_backup.pl
---

diff --git a/bacula/src/cats/make_catalog_backup.pl.in b/bacula/src/cats/make_catalog_backup.pl.in
index e444d97c3..0f3649fe4 100644
--- a/bacula/src/cats/make_catalog_backup.pl.in
+++ b/bacula/src/cats/make_catalog_backup.pl.in
@@ -137,6 +137,9 @@ sub analyse_mysql
 sub handle_catalog
 {
     my ($mode, %args) = @_;
+    if (exists $args{working_dir} and $wd ne $args{working_dir}) {
+	$wd = $args{working_dir};
+    }
     if ($args{db_type} eq 'SQLite3') {
         $ENV{PATH}="@SQLITE_BINDIR@:$ENV{PATH}";
         if ($mode eq 'dump') {