From eda9ff98ebb8429fa2aef3806ac72c6811baa1eb Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Mon, 14 Sep 2015 11:40:42 +0200 Subject: [PATCH] bin/debsources-backup-db: fix reading of log_file configuration option --- bin/debsources-backup-db | 5 ++++- bin/debsources-main | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/debsources-backup-db b/bin/debsources-backup-db index 420e09cc..885b524a 100755 --- a/bin/debsources-backup-db +++ b/bin/debsources-backup-db @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2014 The Debsources developers . +# Copyright (C) 2014-2015 The Debsources developers . # See the AUTHORS file at the top-level directory of this distribution and at # https://anonscm.debian.org/gitweb/?p=qa/debsources.git;a=blob;f=AUTHORS;hb=HEAD # @@ -31,7 +31,10 @@ fi umask 0002 export LANG=C +# minimal interpolation support, for the few configuration values needed here root_dir=$(grep "^root_dir:" "$conffile" | awk '{ print $2 }') +log_dir=$(grep "^log_dir:" "$conffile" | awk '{ print $2 }') + conf_get () { local key="$1" local value=$(grep "^${key}:" "$conffile" | head -n 1 | awk '{ print $2 }') diff --git a/bin/debsources-main b/bin/debsources-main index a0b53ca3..c7c72607 100755 --- a/bin/debsources-main +++ b/bin/debsources-main @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2013-2014 The Debsources developers . +# Copyright (C) 2013-2015 The Debsources developers . # See the AUTHORS file at the top-level directory of this distribution and at # https://anonscm.debian.org/gitweb/?p=qa/debsources.git;a=blob;f=AUTHORS;hb=HEAD # @@ -36,8 +36,7 @@ fi umask 0002 export LANG=C -# minimal interpolation support, for the few configuration values needed -# by the update driver +# minimal interpolation support, for the few configuration values needed here root_dir=$(grep "^root_dir:" "$conffile" | awk '{ print $2 }') log_dir=$(grep "^log_dir:" "$conffile" | awk '{ print $2 }')