<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/ffdb7d9ee9e59e9d69a2f29ac08dfd5090f84759">https://github.com/macports/macports-base/commit/ffdb7d9ee9e59e9d69a2f29ac08dfd5090f84759</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 ffdb7d9ee Revert "portextract: Create symlink if no $worksrcpath"
</span>ffdb7d9ee is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ffdb7d9ee9e59e9d69a2f29ac08dfd5090f84759
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Dec 4 16:38:21 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> Revert "portextract: Create symlink if no $worksrcpath"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit 7921b2e05e9a4c9cda6efedee496affb305dcc07.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This change silently broke an unknown number of ports due to
</span><span style='display:block; white-space:pre;color:#404040;'> different behaviour of symlinks vs directories. See e.g. slime,
</span><span style='display:block; white-space:pre;color:#404040;'> scm_breeze. The reversion may also break things, but at least they'll
</span><span style='display:block; white-space:pre;color:#404040;'> give an error rather than silently installing nothing but a broken
</span><span style='display:block; white-space:pre;color:#404040;'> link.
</span>---
src/port1.0/portextract.tcl | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portextract.tcl b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 00a1bbea1..791f44444 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portextract.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +124,7 @@ proc portextract::extract_start {args} {
</span> }
proc portextract::extract_main {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global UI_PREFIX filespath workpath worksrcdir worksrcpath extract.dir use_dmg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global UI_PREFIX filespath worksrcpath extract.dir use_dmg
</span>
if {![exists distfiles] && ![exists extract.only]} {
# nothing to do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,16 +156,5 @@ proc portextract::extract_main {args} {
</span>
chownAsRoot ${extract.dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If expected path of extract doesn't exist && worksrcdir is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not explicitly set to subdirectory, symlink to actual path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file isdirectory $worksrcpath] && [regexp {^[^/]+$} $worksrcdir]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set workdirs [glob -nocomplain -types d [file join $workpath *]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[llength $workdirs] == 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dir [file tail [lindex $workdirs 0]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug [format [msgcat::mc "Symlink: %s -> %s"] $worksrcpath $dir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- symlink $dir $worksrcpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> return 0
}
</pre><pre style='margin:0'>
</pre>