[automake-commit] branch master updated: python: properly uninstall __pycache__ in subdirectories

[Karl Berry]

This is an automated email from the git hooks/post-receive script.

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=6207236f9bf29dc84b892e482439591b5cf9603b

The following commit(s) were added to refs/heads/master by this push:
     new 6207236  python: properly uninstall __pycache__ in subdirectories
6207236 is described below

commit 6207236f9bf29dc84b892e482439591b5cf9603b
Author: Lukas Fleischer <address@hidden>
AuthorDate: Wed Jan 29 18:12:29 2020 -0800

    python: properly uninstall __pycache__ in subdirectories
    
    This change finishes fixing automake bug#32088:
    https://debbugs.gnu.org/32088
    
    * lib/am/python.am (uninstall-%DIR%PYTHON): Uninstall
    byte-compiled files in a '__pycache__' subdirectory
    from sub/__pycache__/, not __pycache__/sub/.
    (am__pep3147_tweak): prefix __pycache__ here, for both .pyc and .pyo.
    https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html
    * t/instmany-python.sh (limit): increase to 4500, following
    Andreas Huettel, https://debbugs.gnu.org/32088#11.
---
 lib/am/python.am     | 4 ++--
 t/instmany-python.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/am/python.am b/lib/am/python.am
index 09332e2..6346a7e 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -97,7 +97,7 @@ endif %?INSTALL%
 if %?INSTALL%
 
 ?FIRST?am__pep3147_tweak = \
-?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc &.*.pyo|'
+?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc 
__pycache__/&.*.pyo|'
 
 .PHONY uninstall-am: uninstall-%DIR%PYTHON
 uninstall-%DIR%PYTHON:
@@ -116,7 +116,7 @@ uninstall-%DIR%PYTHON:
        done; \
 ## This is somewhat tricky, because for newer pythons we have to take PEP-3147
 ## into account.  Avoid exceeding the command-line length limit.
-       dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \
+       dir='$(DESTDIR)$(%NDIR%dir)'; \
        echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
          while read files; do \
            $(am__uninstall_files_from_dir) || st=$$?; \
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
index f1f82d9..dce3594 100644
--- a/t/instmany-python.sh
+++ b/t/instmany-python.sh
@@ -21,7 +21,7 @@
 required='python'
 . test-init.sh
 
-limit=2500
+limit=4500
 subdir=long_subdir_name_with_many_characters
 nfiles=81
 list=$(seq_ 1 $nfiles)