[gentoo-commits] proj/pgsql-patches:initscripts commit in: /

[Aaron Swenson]

commit:     8f36b38642832f500e0bbcb83f0026b365a4d070
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 13:46:54 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 13:46:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=8f36b386

Fixed passing environments issue. (Bug 394159)

---
 postgresql.init |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/postgresql.init b/postgresql.init
index ed1dea4..363ea1a 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -69,7 +69,7 @@ checkconfig() {
 
 	checkpath -d -m 0770 -o postgres:postgres ${socket_path}
 	if [ -e ${socket_path}/.s.PGSQL.${configured_port} ] ; then
-        eerror "Socket conflict."
+		eerror "Socket conflict."
 		eerror "A server is already listening on:"
 		eerror "    ${socket_path}/.s.PGSQL.${configured_port}"
 		eerror "HINT: Change PGPORT to listen on a different socket."
@@ -84,16 +84,21 @@ start() {
 
 	rm -f ${DATA_DIR}/postmaster.pid
 
-	local retval
+	local extraenv
+	local x
+	for x in ${PG_EXTRA_ENV} ; do
+		extraenv="${extraenv} --env ${x}"
+	done
 
 	start-stop-daemon --start \
 		--user postgres \
 		--exec /usr/lib/postgresql-@SLOT@/bin/postgres \
-		--env "PGPORT=${configured_port} ${PG_EXTRA_ENV}" \
+		--env "PGPORT=${configured_port}" \
+		${extraenv} \
 		--wait $((${START_TIMEOUT}*1000)) \
 		--pidfile ${DATA_DIR}/postmaster.pid \
 		-- -D ${PGDATA} --data-directory=${DATA_DIR} --silent-mode=true ${PGOPTS}
-	retval=$?
+	local retval=$?
 
 	if [ $retval -ne 0 ] ; then
 		eerror "Check the PostgreSQL @SLOT@ log for a detailed explanation of the above error."