[patch] 2nd version of patch

postgresql-8.1.0.patch (text/plain), 1.49 KB, created by Pierre Poissinger on 2005-11-13 09:33:51 UTC

--- postgresql-8.1.0.ebuild.ori	2005-11-13 13:08:40.000000000 +0100
+++ postgresql-8.1.0.ebuild	2005-11-13 18:32:33.000000000 +0100
@@ -43,13 +43,20 @@
 	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
-PG_DIR="/var/lib/postgresql"
 
 pkg_setup() {
+	PG_DIR=`([ -f /etc/conf.d/postgresql ] && sed -n 's/^PGDATA=\(.\)/\1/p' < /etc/conf.d/postgresql ) || echo "/var/lib/postgresql"`
+	if [ -z "${PG_DIR}" ] ; then
+		ewarn "Cannot figure out PGDATA, using defaults"
+		PG_DIR="/var/lib/postgresql"
+	fi
+
+	einfo "Using ${PG_DIR} as data dir"
+
 	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
 		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
 		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
+		if [ ${PG_MAJOR} -lt 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 1 ] ; then
 			eerror "Postgres ${PV} cannot upgrade your existing databases, you must"
 			eerror "use pg_dump to export your existing databases to a file, and then"
 			eerror "pg_restore to import them when you have upgraded completely."
@@ -171,6 +178,13 @@
 }
 
 pkg_config() {
+	PG_DIR=`([ -f /etc/conf.d/postgresql ] && sed -n 's/^PGDATA=\(.\)/\1/p' </etc/conf.d/postgresql) || echo "/var/lib/postgresql"`
+	if [ -z "${PG_DIR}" ] ; then
+		ewarn "Cannot figure out PGDATA, using defaults"
+		PG_DIR="/var/lib/postgresql"
+	fi
+
+
 	einfo "Creating the data directory ..."
 	mkdir -p ${PG_DIR}/data
 	chown -Rf postgres:postgres ${PG_DIR}