From d7fe1c624f1b834a20597c3ebf058946fd856c1c Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 8 Aug 2017 23:52:29 +0300 Subject: [PATCH] python,python3: fix opkg collisions with -src packages Fixes: https://github.com/openwrt/packages/issues/4681 Signed-off-by: Alexandru Ardelean --- lang/python/python/files/python-package-install.sh | 2 +- lang/python/python3/files/python3-package-install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python/files/python-package-install.sh b/lang/python/python/files/python-package-install.sh index e8085e5e3..94becf2c9 100644 --- a/lang/python/python/files/python-package-install.sh +++ b/lang/python/python/files/python-package-install.sh @@ -51,7 +51,7 @@ find "$dst_dir" -name "*.egg-info" | xargs rm -rf if [ "$mode" == "sources" ] ; then # Copy only python source files - find $dst_dir -type f -not -name "*\.py" | xargs rm -f + find $dst_dir -not -type d -not -name "*\.py" | xargs rm -f # Delete empty folders (if the case) if [ -d "$dst_dir/usr" ] ; then diff --git a/lang/python/python3/files/python3-package-install.sh b/lang/python/python3/files/python3-package-install.sh index cbb84ab1c..dd1e708fc 100644 --- a/lang/python/python3/files/python3-package-install.sh +++ b/lang/python/python3/files/python3-package-install.sh @@ -51,7 +51,7 @@ find "$dst_dir" -name "*.egg-info" | xargs rm -rf if [ "$mode" == "sources" ] ; then # Copy only python source files - find $dst_dir -type f -not -name "*\.py" | xargs rm -f + find $dst_dir -not -type d -not -name "*\.py" | xargs rm -f # Delete empty folders (if the case) if [ -d "$dst_dir/usr" ] ; then