aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Sergi <al3hex@gmail.com>2016-10-27 13:17:02 +0000
committerAlessio Sergi <al3hex@gmail.com>2016-10-27 13:22:54 +0000
commitd77d6cde40fb47a926ce00a4d32e6424eb209fd2 (patch)
treeecba4e8c552dd382003d8ecd004a361bb60b1384
parentafc50a12900df4d481113c31b7a9923d99dd029b (diff)
downloadvoid-packages-d77d6cde40fb47a926ce00a4d32e6424eb209fd2.tar
void-packages-d77d6cde40fb47a926ce00a4d32e6424eb209fd2.tar.gz
void-packages-d77d6cde40fb47a926ce00a4d32e6424eb209fd2.tar.bz2
void-packages-d77d6cde40fb47a926ce00a4d32e6424eb209fd2.tar.lz
void-packages-d77d6cde40fb47a926ce00a4d32e6424eb209fd2.tar.xz
void-packages-d77d6cde40fb47a926ce00a4d32e6424eb209fd2.tar.zst
void-packages-d77d6cde40fb47a926ce00a4d32e6424eb209fd2.zip
xbps-src: limit the search to the /usr/lib/pythonX.Y directory
-rw-r--r--common/hooks/post-install/04-create-xbps-metadata-scripts.sh2
-rw-r--r--common/hooks/pre-pkg/03-rewrite-python-shebang.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index 090e27e4a7c..15a6aae305f 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -232,7 +232,7 @@ _EOF
# Handle python bytecode archives with pycompile trigger.
#
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
- pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+ pycompile_version="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
if [ -n "${pycompile_dirs}" -o -n "${pycompile_module}" ]; then
diff --git a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
index e42b28a3bb9..2c95cd6005e 100644
--- a/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
+++ b/common/hooks/pre-pkg/03-rewrite-python-shebang.sh
@@ -11,7 +11,7 @@ hook() {
fi
if [ -d ${PKGDESTDIR}/usr/lib/python* ]; then
- pyver="$(find ${PKGDESTDIR}/usr/lib/python* -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
+ pyver="$(find ${PKGDESTDIR}/usr/lib/python* -prune -type d | grep -o '[[:digit:]]\.[[:digit:]]$')"
fi
if [ -n "$pycompile_version" ]; then