diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2012-09-10 02:07:08 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2012-09-10 02:07:08 +0000 |
| commit | 785aa5b872b060642b1aa8f2d87e47e9bc80cf62 (patch) | |
| tree | 0e4fcd94e805a529ad63e56370e54134b86d13dd /eclass/mysql.eclass | |
| parent | added prefix keywords (diff) | |
| download | gentoo-2-785aa5b872b060642b1aa8f2d87e47e9bc80cf62.tar.gz gentoo-2-785aa5b872b060642b1aa8f2d87e47e9bc80cf62.tar.bz2 gentoo-2-785aa5b872b060642b1aa8f2d87e47e9bc80cf62.zip | |
drop usage of strip_duplicate_slashes (it's a portage internal)
Diffstat (limited to 'eclass/mysql.eclass')
| -rw-r--r-- | eclass/mysql.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index a87b7ea09498..7f2c242e3c88 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.173 2012/07/31 16:57:29 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.174 2012/09/10 02:07:08 ferringb Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -1304,8 +1304,10 @@ mysql_pkg_config() { fi if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then - local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" - local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" if [[ -d "${old_MY_DATADIR_s}" ]]; then if [[ -d "${MY_DATADIR_s}" ]]; then |