diff options
| author |   Manuel Rüger <mrueg@gentoo.org> | 2015-06-29 11:01:31 +0000 |
|---|---|---|
| committer | Manuel Rüger <mrueg@gentoo.org> | 2015-06-29 11:01:31 +0000 |
| commit | 7304bf4c29d3f82d53dcdebf6db600027c80e8ba (patch) | |
| tree | ce9b80b280605d9d81dff0f9b070f5b4fa3e3a3c /eclass | |
| parent | Version bump (diff) | |
| download | gentoo-2-7304bf4c29d3f82d53dcdebf6db600027c80e8ba.tar.gz gentoo-2-7304bf4c29d3f82d53dcdebf6db600027c80e8ba.tar.bz2 gentoo-2-7304bf4c29d3f82d53dcdebf6db600027c80e8ba.zip | |
Quote RUBY_S and sub_S as the directory could contain spaces.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/ruby-ng.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 796391514c11..65959af28e75 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1694 2015/06/29 00:27:17 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1695 2015/06/29 11:01:31 mrueg Exp $ + + 29 Jun 2015; Manuel Rüger <mrueg@gentoo.org> ruby-ng.eclass: + Quote RUBY_S and sub_S as the directory could contain spaces. 29 Jun 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass: Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc. diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index 137bf0f14fac..9d3ee6fa7889 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.57 2015/05/31 05:57:23 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.58 2015/06/29 11:01:31 mrueg Exp $ # @ECLASS: ruby-ng.eclass # @MAINTAINER: @@ -302,7 +302,7 @@ _ruby_invoke_environment() { old_S=${S} case ${EAPI} in 4|5) - if [ -z ${RUBY_S} ]; then + if [ -z "${RUBY_S}" ]; then sub_S=${P} else sub_S=${RUBY_S} @@ -316,7 +316,7 @@ _ruby_invoke_environment() { # Special case, for the always-lovely GitHub fetches. With this, # we allow the star glob to just expand to whatever directory it's # called. - if [[ ${sub_S} = *"*"* ]]; then + if [[ "${sub_S}" = *"*"* ]]; then case ${EAPI} in 2|3) #The old method of setting S depends on undefined package @@ -325,7 +325,7 @@ _ruby_invoke_environment() { ;; esac pushd "${WORKDIR}"/all &>/dev/null - sub_S=$(eval ls -d ${sub_S} 2>/dev/null) + sub_S=$(eval ls -d "${sub_S}" 2>/dev/null) popd &>/dev/null fi |