From 9ef5498e91ddf1af9c1dcefcb60499fc090125b8 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 10 May 2017 15:33:05 +0200 Subject: python-utils-r1.eclass: python_moduleinto, allow package dot-notation Allow specifying the relative package destination using the dot-notation used by Python itself (e.g. 'foo.bar') in addition to the directory form ('foo/bar'). Since dot can not be used in Python package names, this change is backwards-compatible. --- eclass/python-utils-r1.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'eclass/python-utils-r1.eclass') diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index c594cb46b5f3..863051337f0b 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -810,7 +810,9 @@ python_newscript() { # The can either be an absolute target system path (in which # case it needs to start with a slash, and ${ED} will be prepended to # it) or relative to the implementation's site-packages directory -# (then it must not start with a slash). +# (then it must not start with a slash). The relative path can be +# specified either using the Python package notation (separated by dots) +# or the directory notation (using slashes). # # When not set explicitly, the modules are installed to the top # site-packages directory. @@ -867,7 +869,7 @@ python_domodule() { local PYTHON_SITEDIR=${PYTHON_SITEDIR} [[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR - d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot} + d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot//.//} fi ( -- cgit v1.2.3-65-gdbad