titanofold 14/11/08 12:51:46 Modified: postgis-2.0.6.ebuild postgis-2.1.4.ebuild ChangeLog Log: Fix bug 528584. Use grep instead of cut. (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
Revision Changes Path 1.2 dev-db/postgis/postgis-2.0.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild?r1=1.1&r2=1.2 Index: postgis-2.0.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- postgis-2.0.6.ebuild 5 Nov 2014 16:09:12 -0000 1.1 +++ postgis-2.0.6.ebuild 8 Nov 2014 12:51:46 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild,v 1.1 2014/11/05 16:09:12 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.6.ebuild,v 1.2 2014/11/08 12:51:46 titanofold Exp $ EAPI="4" @@ -140,13 +140,11 @@ fi # The server we work with must be the same slot we built against. - local server_version - server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \ - -Aqwtc 'SELECT version()' 2> /dev/null) + local server_match + server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \ + -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}") if [[ $? = 0 ]] ; then - server_version=$(echo ${server_version} | cut -d " " -f 2 | \ - cut -d "." -f -2 | tr -d .) - if [[ $server_version != ${PGSLOT//.} ]] ; then + if [[ $server_match -ne 1 ]] ; then unset PGPASSWORD eerror "Server version must be ${PGSLOT}.x" die "Server version isn't ${PGSLOT}.x" @@ -260,8 +258,5 @@ sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs" einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled." einfo - einfo "To enable other databases, change the default slot:" - einfo " postgresql-config set <slot>" - einfo "Then, emerge this package again:" - einfo " emerge -av =${CATEGORY}/${PF}" + einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled." } 1.2 dev-db/postgis/postgis-2.1.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild?r1=1.1&r2=1.2 Index: postgis-2.1.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- postgis-2.1.4.ebuild 5 Nov 2014 16:09:12 -0000 1.1 +++ postgis-2.1.4.ebuild 8 Nov 2014 12:51:46 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild,v 1.1 2014/11/05 16:09:12 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.1.4.ebuild,v 1.2 2014/11/08 12:51:46 titanofold Exp $ EAPI="5" POSTGRES_COMPAT=( 9.{0,1,2,3,4} ) @@ -167,13 +167,11 @@ fi # The server we work with must be the same slot we built against. - local server_version - server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \ - -Aqwtc 'SELECT version()' 2> /dev/null) + local server_match + server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \ + -Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}") if [[ $? = 0 ]] ; then - server_version=$(echo ${server_version} | cut -d " " -f 2 | \ - cut -d "." -f -2 | tr -d .) - if [[ $server_version != ${PGSLOT//.} ]] ; then + if [[ $server_match -ne 1 ]] ; then unset PGPASSWORD eerror "Server version must be ${PGSLOT}.x" die "Server version isn't ${PGSLOT}.x" @@ -287,8 +285,5 @@ sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs" einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled." einfo - einfo "To enable other databases, change the default slot:" - einfo " postgresql-config set <slot>" - einfo "Then, emerge this package again:" - einfo " emerge -av =${CATEGORY}/${PF}" + einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled." } 1.95 dev-db/postgis/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?rev=1.95&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?rev=1.95&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/postgis/ChangeLog?r1=1.94&r2=1.95 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- ChangeLog 5 Nov 2014 16:09:12 -0000 1.94 +++ ChangeLog 8 Nov 2014 12:51:46 -0000 1.95 @@ -1,6 +1,10 @@ # ChangeLog for dev-db/postgis # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.94 2014/11/05 16:09:12 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.95 2014/11/08 12:51:46 titanofold Exp $ + + 08 Nov 2014; Aaron W. Swenson <[email protected]> postgis-2.0.6.ebuild, + postgis-2.1.4.ebuild: + Fix bug 528584. Use grep instead of cut. *postgis-2.1.4 (05 Nov 2014) *postgis-2.0.6 (05 Nov 2014)
