From: Mike Gilbert Date: Mon, 7 Dec 2015 16:55:21 +0000 (-0500) Subject: dev-python/six: Fix quoting and remove duplicate slashes X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8666a5c7e102946b1f8777e9a01bf4949d0513c5;p=gentoo.git dev-python/six: Fix quoting and remove duplicate slashes Package-Manager: portage-2.2.26_p10 --- diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index 810d8156f5fe..b5384b870c64 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -33,7 +33,8 @@ PATCHES=( pkg_pretend() { six_dir_check() { type -p "${PYTHON}" > /dev/null || return 0 - local dir="${ROOT}"/$(python_get_sitedir)/six + local dir="${ROOT%/}$(python_get_sitedir)"/six + echo "${dir}" [[ -d "${dir}" ]] \ && die "${PN} doesn't work if ${dir} is a directory #546730" } @@ -42,7 +43,7 @@ pkg_pretend() { pkg_setup() { six_dir_check() { - local dir="${ROOT}"/$(python_get_sitedir)/six + local dir="${ROOT%/}$(python_get_sitedir)"/six [[ -d "${dir}" ]] \ && die "${PN} doesn't work if ${dir} is a directory #546730" }