<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/6f7ed40b1df74c6dd62588a0f8cec5a7e8a6959e">https://github.com/macports/macports-base/commit/6f7ed40b1df74c6dd62588a0f8cec5a7e8a6959e</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 6f7ed40b Make startupitems before destroot phase, not after
</span>6f7ed40b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f7ed40b1df74c6dd62588a0f8cec5a7e8a6959e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Aug 17 20:39:47 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Make startupitems before destroot phase, not after
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This allows ports to customize their launchd plists during the destroot
</span><span style='display:block; white-space:pre;color:#404040;'> phase. It also makes it easier for a developer to debug launchd plists
</span><span style='display:block; white-space:pre;color:#404040;'> since now the entire destroot phase doesn't need to be completed before
</span><span style='display:block; white-space:pre;color:#404040;'> the launchd plists are created.
</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/60653
</span>---
src/port1.0/portdestroot.tcl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
<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 df7a414c..5fb2ccb2 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;'>@@ -118,6 +118,9 @@ proc portdestroot::destroot_start {args} {
</span> }
file mkdir "${destroot}${prefix}"
system -W ${destroot}${prefix} "${mtree} -e -U -f [file join ${portsharepath} install prefix.mtree]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create startup-scripts/items
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portstartupitem::startupitem_create
</span> }
proc portdestroot::destroot_main {args} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,9 +134,6 @@ proc portdestroot::destroot_finish {args} {
</span> os.platform os.version
variable oldmask
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create startup-scripts/items
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- portstartupitem::startupitem_create
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> foreach fileToDelete {share/info/dir lib/charset.alias} {
if {[file exists "${destroot}${prefix}/${fileToDelete}"]} {
ui_debug "Deleting stray ${fileToDelete} file."
</pre><pre style='margin:0'>
</pre>