<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/6e4ac4a0310de32d601e535d0b3cb113dd4f9c56">https://github.com/macports/macports-base/commit/6e4ac4a0310de32d601e535d0b3cb113dd4f9c56</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 6e4ac4a03 restore::resolve_dependencies: handle new path deps
</span>6e4ac4a03 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6e4ac4a0310de32d601e535d0b3cb113dd4f9c56
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jun 5 08:53:29 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    restore::resolve_dependencies: handle new path deps
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Check if a path-based dep has to be fulfilled by some port that is not
</span><span style='display:block; white-space:pre;color:#404040;'>    in the snapshot, and add it to the list if so.
</span>---
 src/macports1.0/restore.tcl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/restore.tcl b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index dc54ef61f..96b328eea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -456,8 +456,13 @@ namespace eval restore {
</span>                 foreach depspec [dict get $portinfo $deptype] {
                     set dependency [resolve_depspec $depspec $ports $snapshot_id]
                     if {$dependency eq ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        # Not fulfilled by a port in the snapshot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        # Not fulfilled by a port in the snapshot. Check if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        # it needs to be fulfilled by any port. (This is safe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        # because all ports are inactive at this point.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set dependency [$workername eval [list _get_dep_port $depspec]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        if {$dependency eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        }
</span>                     }
                     if {![$dependencies node exists $dependency]} {
                         $dependencies node insert $dependency
</pre><pre style='margin:0'>

</pre>