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

</pre>
<p><a href="https://github.com/macports/macports-base/commit/8db11c80a859bbe0a91d9162d56fec3bef88f511">https://github.com/macports/macports-base/commit/8db11c80a859bbe0a91d9162d56fec3bef88f511</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 8db11c80a Keep destroot.keepdirs inside of $destroot
</span>8db11c80a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8db11c80a859bbe0a91d9162d56fec3bef88f511
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Oct 4 03:10:40 2023 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Keep destroot.keepdirs inside of $destroot
</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/55673
</span>---
 src/port1.0/portdestroot.tcl | 3 +++
 1 file changed, 3 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portdestroot.tcl b/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 364ce16b3..ec10139f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portdestroot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,7 @@
</span> 
 package provide portdestroot 1.0
 package require portutil 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+package require fileutil
</span> 
 set org.macports.destroot [target_new org.macports.destroot portdestroot::destroot_main]
 target_provides ${org.macports.destroot} destroot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,6 +176,8 @@ proc portdestroot::destroot_finish {args} {
</span> 
     # Prune empty directories in ${destroot}
     foreach path ${destroot.keepdirs} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Prepend $destroot if $path isn't already inside it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set path [::fileutil::jail $destroot $path]
</span>         if {![file isdirectory ${path}]} {
             xinstall -m 0755 -d ${path}
         }
</pre><pre style='margin:0'>

</pre>