<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/84f65e6dea4ac33d992da5ec7ab4376b2dae6514">https://github.com/macports/macports-ports/commit/84f65e6dea4ac33d992da5ec7ab4376b2dae6514</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 84f65e6dea4 python pg: test.env improvements
</span>84f65e6dea4 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 84f65e6dea4ac33d992da5ec7ab4376b2dae6514
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Mar 15 13:06:01 2023 +1100

<span style='display:block; white-space:pre;color:#404040;'>    python pg: test.env improvements
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Don't override PYTHONPATH if already set by the Portfile. Don't set it
</span><span style='display:block; white-space:pre;color:#404040;'>    to an empty value if there are no lib* dirs found.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/67055
</span>---
 _resources/port1.0/group/python-1.0.tcl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/python-1.0.tcl b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 045a1cd0c86..a60db58d593 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -571,6 +571,11 @@ pre-livecheck {
</span> 
 
 pre-test {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # set PYTHONPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    test.env-append PYTHONPATH=[join [glob -nocomplain ${worksrcpath}/build/lib*] :]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # set PYTHONPATH if not already set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[lsearch ${test.env} PYTHONPATH=*] == -1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set libdirs [glob -nocomplain -directory ${worksrcpath}/build lib*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {$libdirs ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            test.env-append PYTHONPATH=[join $libdirs :]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
</pre><pre style='margin:0'>

</pre>