public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: James Le Cuirot <chewi@gentoo.org>
To: gentoo-dev <gentoo-dev@lists.gentoo.org>
Cc: James Le Cuirot <chewi@gentoo.org>
Subject: [gentoo-dev] [PATCH 01/12] python-utils-r1.eclass: Fix some double slash paths
Date: Thu,  3 Jan 2019 21:39:13 +0000	[thread overview]
Message-ID: <20190103213924.22835-2-chewi@gentoo.org> (raw)
In-Reply-To: <20190103213924.22835-1-chewi@gentoo.org>

If Python returns relative site or script directories then something
is very wrong!

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 eclass/python-utils-r1.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e3cf82b4b58f..da76a755fb34 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-utils-r1.eclass
@@ -797,11 +797,11 @@ python_newexe() {
 
 	# install the wrapper
 	_python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
-		"${ED%/}/${wrapd}/${newfn}" || die
+		"${ED%/}${wrapd}/${newfn}" || die
 
 	# don't use this at home, just call python_doscript() instead
 	if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
-		python_fix_shebang -q "${ED%/}/${d}/${newfn}"
+		python_fix_shebang -q "${ED%/}${d}/${newfn}"
 	fi
 }
 
@@ -927,7 +927,7 @@ python_domodule() {
 		doins -r "${@}" || return ${?}
 	)
 
-	python_optimize "${ED%/}/${d}"
+	python_optimize "${ED%/}${d}"
 }
 
 # @FUNCTION: python_doheader
-- 
2.19.2



  reply	other threads:[~2019-01-03 21:40 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-03 21:39 [gentoo-dev] [PATCH] Eclass changes for cross-compiling Python modules James Le Cuirot
2019-01-03 21:39 ` James Le Cuirot [this message]
2019-01-03 21:39 ` [gentoo-dev] [PATCH 02/12] python-utils-r1.eclass: New python_fix_shebang approach James Le Cuirot
2019-01-04  6:02   ` Michał Górny
2019-01-06 17:20     ` James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 03/12] python-utils-r1.eclass: Have wrapper workdir default to "impl" arg James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 04/12] python-utils-r1.eclass: Use wrapper scripts to fix cross-compiling James Le Cuirot
2019-01-04 15:53   ` Michał Górny
2019-01-05 21:30     ` James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 05/12] python-utils-r1.eclass: Replace temporary paths in python_fix_shebang James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 06/12] python-utils-r1.eclass: Don't die in python_fix_shebang if all fixed James Le Cuirot
2019-01-04 15:55   ` Michał Górny
2019-01-04 18:10     ` Mike Gilbert
2019-01-04 18:26       ` Michał Górny
2019-01-05 21:38         ` James Le Cuirot
2019-01-05 21:42           ` Michał Górny
2019-01-06 14:52             ` James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 07/12] python-utils-r1.eclass: Add special wrapper handling for Python itself James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 08/12] python-utils-r1.eclass: Adjust wrappers for Python 3.7 libdir change James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 09/12] python-any-r1.eclass: Export PYTHON after checking whether installed James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 10/12] python-any-r1.eclass: Create wrappers against build system's config James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 11/12] distutils-r1.eclass: Fix cross-compiling James Le Cuirot
2019-01-03 21:39 ` [gentoo-dev] [PATCH 12/12] distutils-r1.eclass: Make distutils-r1_create_setup_cfg external James Le Cuirot
2019-01-04  2:11 ` [gentoo-dev] [PATCH] Eclass changes for cross-compiling Python modules Benda Xu
2019-01-04 16:03 ` Michał Górny
2019-01-05  0:06   ` James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190103213924.22835-2-chewi@gentoo.org \
    --to=chewi@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox