<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/a3bb2f672f7c05b50e50ee323201cda6984a667f">https://github.com/macports/macports-base/commit/a3bb2f672f7c05b50e50ee323201cda6984a667f</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 a3bb2f6 fix statefile writing when locking unsupported
</span>a3bb2f6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a3bb2f672f7c05b50e50ee323201cda6984a667f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 3 19:07:45 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> fix statefile writing when locking unsupported
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The version and checksum were not being written to the statefile if
</span><span style='display:block; white-space:pre;color:#404040;'> adv-flock returned EOPNOTSUPP.
</span>---
src/port1.0/portutil.tcl | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index abe349b..edce7ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1781,10 +1781,9 @@ proc open_statefile {args} {
</span> if {$result eq "EAGAIN"} {
ui_notice "Waiting for lock on $statefile"
adv-flock $fd -exclusive
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {$result eq "EOPNOTSUPP"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Locking not supported, just return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return $fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$result ne "EOPNOTSUPP"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We can continue without locking if it's not supported,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but other errors are likely a genuine problem.
</span> return -code error "$result obtaining lock on $statefile"
}
}
</pre><pre style='margin:0'>
</pre>