diff options
| author | Mike Gilbert <floppym@gentoo.org> | 2015-12-08 11:33:08 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2015-12-08 11:33:08 -0500 |
| commit | 660b793b6b704b2e3a9b3bc6e4257fb61e60bd0b (patch) | |
| tree | 2c14b84168b0401fc75ea4dd1719f40a3c05ce1d | |
| parent | 2808e2bee3414fb583278874bd7ab298003bdd5d (diff) | |
| download | gentoo-660b793b6b704b2e3a9b3bc6e4257fb61e60bd0b.tar.gz gentoo-660b793b6b704b2e3a9b3bc6e4257fb61e60bd0b.tar.xz | |
dev-python/six: Drop pkg_pretend check for six directory
Calling python_foreach_impl from pkg_pretend currently fails if the relevent
versions of dev-lang/python are not installed. pkg_pretend runs before
dependencies are installed, so we can't rely on them.
Package-Manager: portage-2.2.26_p10
| -rw-r--r-- | dev-python/six/six-1.10.0.ebuild | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index 2774a6298ab..b00b76cf977 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -26,25 +26,12 @@ PATCHES=( "${FILESDIR}"/1.9.0-mapping.patch ) -# Run twice. -# pkg_pretend to catch as early as possible, but be forgiving if -# python impl is not installed allready. -# pkg_setup to catch them all -pkg_pretend() { - six_dir_check() { - type -p "${PYTHON}" > /dev/null || return 0 - local dir="${ROOT%/}$(python_get_sitedir)"/six - [[ -d "${dir}" ]] \ - && die "${PN} doesn't work if ${dir} is a directory #546730" - } - python_foreach_impl six_dir_check -} - pkg_setup() { six_dir_check() { local dir="${ROOT%/}$(python_get_sitedir)"/six - [[ -d "${dir}" ]] \ - && die "${PN} doesn't work if ${dir} is a directory #546730" + if [[ -d "${dir}" ]]; then + die "${PN} doesn't work if ${dir} is a directory #546730" + fi } python_foreach_impl six_dir_check } |