Alon Bar-Lev has uploaded a new change for review. Change subject: db: cleanup: delegate all DBFUNC_* vars into upgrade scripts ......................................................................
db: cleanup: delegate all DBFUNC_* vars into upgrade scripts Change-Id: I325be1dc9d4cd034fbf077d6894a2f09b4a4c42e Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/dbscripts/dbfunc-common.sh 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/24950/1 diff --git a/packaging/dbscripts/dbfunc-common.sh b/packaging/dbscripts/dbfunc-common.sh index d17c20f..26cb461 100644 --- a/packaging/dbscripts/dbfunc-common.sh +++ b/packaging/dbscripts/dbfunc-common.sh @@ -415,13 +415,12 @@ _dbfunc_common_run_file() { local file="${1}" if [ -x "${file}" ]; then + # delegate all DBFUNC_ vars in subshell echo "Running upgrade shell script '${file}'..." - DBFUNC_COMMON_DBSCRIPTS_DIR="${DBFUNC_COMMON_DBSCRIPTS_DIR}" \ - DBFUNC_DB_HOST="${DBFUNC_DB_HOST}" \ - DBFUNC_DB_PORT="${DBFUNC_DB_PORT}" \ - DBFUNC_DB_USER="${DBFUNC_DB_USER}" \ - DBFUNC_DB_DATABASE="${DBFUNC_DB_DATABASE}" \ + ( + eval "$(set | grep '^DBFUNC_' | sed 's/^\([^=]*\)=.*/export \1/')" "${file}" + ) else echo "Running upgrade sql script '${file}'..." dbfunc_psql_die --file="${file}" > /dev/null -- To view, visit http://gerrit.ovirt.org/24950 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I325be1dc9d4cd034fbf077d6894a2f09b4a4c42e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
