<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134990] trunk/base/src/port/portindex.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134990">134990</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-04-12 15:41:16 -0700 (Sun, 12 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: refactor portindex, move common code into separate function, make signal-safe to allow SIGINT/SIGTERM</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcportportindextcl">trunk/base/src/port/portindex.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcportportindextcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/portindex.tcl (134989 => 134990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/portindex.tcl 2015-04-12 22:07:40 UTC (rev 134989)
+++ trunk/base/src/port/portindex.tcl 2015-04-12 22:41:16 UTC (rev 134990)
</span><span class="lines">@@ -30,115 +30,155 @@
</span><span class="cx"> puts "-p:\tPretend to be on another platform"
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+proc _read_index {idx} {
+ global qindex oldfd
+
+ set offset $qindex($idx)
+ seek $oldfd $offset
+ gets $oldfd line
+
+ set name [lindex $line 0]
+ set len [lindex $line 1]
+ set line [read $oldfd [expr {$len - 1}]]
+
+ return [list $name $len $line]
+}
+
+proc _write_index {name len line} {
+ global fd
+
+ puts $fd [list $name $len]
+ puts $fd $line
+}
+
+proc _write_index_from_portinfo {portinfoname {is_subport no}} {
+ global keepkeys
+
+ upvar $portinfoname portinfo
+
+ array set keep_portinfo {}
+ foreach key [array names keepkeys] {
+ # filter keys
+ if {![info exists portinfo($key)]} {
+ continue
+ }
+
+ # copy values we want to keep
+ set keep_portinfo($key) $portinfo($key)
+ }
+
+ # if this is not a subport, add the "subports" key
+ if {!$is_subport && [info exists portinfo(subports)]} {
+ set keep_portinfo(subports) $portinfo(subports)
+ }
+
+ set output [array get keep_portinfo]
+ set len [expr {[string length $output] + 1}]
+ _write_index $portinfo(name) $len $output
+}
+
+proc _open_port {portinfo_name portdir absportdir port_options_name {subport {}}} {
+ global save_prefix
+ upvar $portinfo_name portinfo
+ upvar $port_options_name port_options
+
+ if {$subport eq {}} {
+ set interp [mportopen file://$absportdir $port_options]
+ } else {
+ set interp [mportopen file://$absportdir [concat $port_options subport $subport]]
+ }
+
+ if {[array exists portinfo]} {
+ array unset portinfo
+ }
+ array set portinfo [mportinfo $interp]
+ mportclose $interp
+
+ set portinfo(portdir) $portdir
+}
+
</ins><span class="cx"> proc pindex {portdir} {
</span><span class="cx"> global target oldfd oldmtime newest qindex fd directory outdir stats full_reindex \
</span><span class="cx"> ui_options port_options save_prefix keepkeys
</span><span class="cx">
</span><ins>+ set qname [string tolower [file tail $portdir]]
+ set absportdir [file join $directory $portdir]
+ set portfile [file join $absportdir Portfile]
</ins><span class="cx"> # try to reuse the existing entry if it's still valid
</span><del>- if {$full_reindex != 1 && [info exists qindex([string tolower [file tail $portdir]])]} {
</del><ins>+ if {$full_reindex != 1 && [info exists qindex($qname)]} {
</ins><span class="cx"> try {
</span><del>- set mtime [file mtime [file join $directory $portdir Portfile]]
</del><ins>+ set mtime [file mtime $portfile]
</ins><span class="cx"> if {$oldmtime >= $mtime} {
</span><del>- set offset $qindex([string tolower [file tail $portdir]])
- seek $oldfd $offset
- gets $oldfd line
- set name [lindex $line 0]
- set len [lindex $line 1]
- set line [read $oldfd $len]
</del><ins>+ lassign [_read_index $qname] name len line
+ _write_index $name $len $line
+ incr stats(skipped)
</ins><span class="cx">
</span><span class="cx"> if {[info exists ui_options(ports_debug)]} {
</span><span class="cx"> puts "Reusing existing entry for $portdir"
</span><span class="cx"> }
</span><span class="cx">
</span><del>- puts $fd [list $name $len]
- puts -nonewline $fd $line
-
- incr stats(skipped)
-
</del><span class="cx"> # also reuse the entries for its subports
</span><span class="cx"> array set portinfo $line
</span><span class="cx"> if {![info exists portinfo(subports)]} {
</span><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx"> foreach sub $portinfo(subports) {
</span><del>- set offset $qindex([string tolower $sub])
- seek $oldfd $offset
- gets $oldfd line
- set name [lindex $line 0]
- set len [lindex $line 1]
- set line [read $oldfd $len]
-
- puts $fd [list $name $len]
- puts -nonewline $fd $line
-
</del><ins>+ _write_index {*}[_read_index [string tolower $sub]]
</ins><span class="cx"> incr stats(skipped)
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return
</span><span class="cx"> }
</span><del>- } catch {*} {
- ui_warn "failed to open old entry for ${portdir}, making a new one"
</del><ins>+ } catch {{POSIX SIG SIGINT} eCode eMessage} {
+ throw
+ } catch {{POSIX SIG SIGTERM} eCode eMessage} {
+ throw
+ } catch {{*} eCode eMessage} {
+ ui_warn "Failed to open old entry for ${portdir}, making a new one"
+ if {[info exists ui_options(ports_debug)]} {
+ puts "$::errorInfo"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> incr stats(total)
</span><del>- set prefix {\${prefix}}
- if {[catch {set interp [mportopen file://[file join $directory $portdir] $port_options]} result]} {
- puts stderr "Failed to parse file $portdir/Portfile: $result"
- # revert the prefix.
- set prefix $save_prefix
- incr stats(failed)
- } else {
- # revert the prefix.
- set prefix $save_prefix
- array set portinfo [mportinfo $interp]
- mportclose $interp
- set portinfo(portdir) $portdir
</del><ins>+ try {
+ _open_port portinfo $portdir $absportdir port_options
</ins><span class="cx"> puts "Adding port $portdir"
</span><span class="cx">
</span><del>- foreach availkey [array names portinfo] {
- # store list of subports for top-level ports only
- if {![info exists keepkeys($availkey)] && $availkey ne "subports"} {
- unset portinfo($availkey)
- }
- }
- set output [array get portinfo]
- set len [expr {[string length $output] + 1}]
- puts $fd [list $portinfo(name) $len]
- puts $fd $output
- set mtime [file mtime [file join $directory $portdir Portfile]]
</del><ins>+ _write_index_from_portinfo portinfo
+ set mtime [file mtime $portfile]
</ins><span class="cx"> if {$mtime > $newest} {
</span><span class="cx"> set newest $mtime
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> # now index this portfile's subports (if any)
</span><span class="cx"> if {![info exists portinfo(subports)]} {
</span><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx"> foreach sub $portinfo(subports) {
</span><span class="cx"> incr stats(total)
</span><del>- set prefix {\${prefix}}
- if {[catch {set interp [mportopen file://[file join $directory $portdir] [concat $port_options subport $sub]]} result]} {
- puts stderr "Failed to parse file $portdir/Portfile with subport '${sub}': $result"
- set prefix $save_prefix
</del><ins>+ try {
+ _open_port portinfo $portdir $absportdir port_options $sub
+ puts "Adding subport $sub"
+
+ _write_index_from_portinfo portinfo yes
+ } catch {{POSIX SIG SIGINT} eCode eMessage} {
+ throw
+ } catch {{POSIX SIG SIGTERM} eCode eMessage} {
+ throw
+ } catch {{*} eCode eMessage} {
+ puts stderr "Failed to parse file $portdir/Portfile with subport '${sub}': $eMessage"
</ins><span class="cx"> incr stats(failed)
</span><del>- } else {
- set prefix $save_prefix
- array unset portinfo
- array set portinfo [mportinfo $interp]
- mportclose $interp
- set portinfo(portdir) $portdir
- puts "Adding subport $sub"
- foreach availkey [array names portinfo] {
- if {![info exists keepkeys($availkey)]} {
- unset portinfo($availkey)
- }
- }
- set output [array get portinfo]
- set len [expr {[string length $output] + 1}]
- puts $fd [list $portinfo(name) $len]
- puts $fd $output
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ } catch {{POSIX SIG SIGINT} eCode eMessage} {
+ throw
+ } catch {{POSIX SIG SIGTERM} eCode eMessage} {
+ throw
+ } catch {{*} eCode eMessage} {
+ puts stderr "Failed to parse file $portdir/Portfile: $eMessage"
+ incr stats(failed)
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,11 +276,26 @@
</span><span class="cx"> version portdir replaced_by license installs_libs} {
</span><span class="cx"> set keepkeys($key) 1
</span><span class="cx"> }
</span><del>-mporttraverse pindex $directory
-if {[info exists oldfd]} {
- close $oldfd
</del><ins>+
+set exit_fail 0
+try {
+ mporttraverse pindex $directory
+} catch {{POSIX SIG SIGINT} eCode eMessage} {
+ puts stderr "SIGINT received, terminating."
+ set exit_fail 1
+} catch {{POSIX SIG SIGTERM} eCode eMessage} {
+ puts stderr "SIGTERM received, terminating."
+ set exit_fail 1
+} finally {
+ if {[info exists oldfd]} {
+ close $oldfd
+ }
+ close $fd
</ins><span class="cx"> }
</span><del>-close $fd
</del><ins>+if {$exit_fail} {
+ exit 1
+}
+
</ins><span class="cx"> file rename -force $tempportindex $outpath
</span><span class="cx"> file mtime $outpath $newest
</span><span class="cx"> mports_generate_quickindex $outpath
</span></span></pre>
</div>
</div>
</body>
</html>