[134990] trunk/base/src/port/portindex.tcl
cal at macports.org
cal at macports.org
Sun Apr 12 15:41:16 PDT 2015
Revision: 134990
https://trac.macports.org/changeset/134990
Author: cal at macports.org
Date: 2015-04-12 15:41:16 -0700 (Sun, 12 Apr 2015)
Log Message:
-----------
base: refactor portindex, move common code into separate function, make signal-safe to allow SIGINT/SIGTERM
Modified Paths:
--------------
trunk/base/src/port/portindex.tcl
Modified: trunk/base/src/port/portindex.tcl
===================================================================
--- 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)
@@ -30,115 +30,155 @@
puts "-p:\tPretend to be on another platform"
}
+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
+}
+
proc pindex {portdir} {
global target oldfd oldmtime newest qindex fd directory outdir stats full_reindex \
ui_options port_options save_prefix keepkeys
+ set qname [string tolower [file tail $portdir]]
+ set absportdir [file join $directory $portdir]
+ set portfile [file join $absportdir Portfile]
# try to reuse the existing entry if it's still valid
- if {$full_reindex != 1 && [info exists qindex([string tolower [file tail $portdir]])]} {
+ if {$full_reindex != 1 && [info exists qindex($qname)]} {
try {
- set mtime [file mtime [file join $directory $portdir Portfile]]
+ set mtime [file mtime $portfile]
if {$oldmtime >= $mtime} {
- 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]
+ lassign [_read_index $qname] name len line
+ _write_index $name $len $line
+ incr stats(skipped)
if {[info exists ui_options(ports_debug)]} {
puts "Reusing existing entry for $portdir"
}
- puts $fd [list $name $len]
- puts -nonewline $fd $line
-
- incr stats(skipped)
-
# also reuse the entries for its subports
array set portinfo $line
if {![info exists portinfo(subports)]} {
return
}
foreach sub $portinfo(subports) {
- 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
-
+ _write_index {*}[_read_index [string tolower $sub]]
incr stats(skipped)
}
return
}
- } catch {*} {
- ui_warn "failed to open old entry for ${portdir}, making a new one"
+ } 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"
+ }
}
}
incr stats(total)
- 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
+ try {
+ _open_port portinfo $portdir $absportdir port_options
puts "Adding port $portdir"
- 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]]
+ _write_index_from_portinfo portinfo
+ set mtime [file mtime $portfile]
if {$mtime > $newest} {
set newest $mtime
}
+
# now index this portfile's subports (if any)
if {![info exists portinfo(subports)]} {
return
}
foreach sub $portinfo(subports) {
incr stats(total)
- 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
+ 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"
incr stats(failed)
- } 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
}
}
+ } 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)
}
}
@@ -236,11 +276,26 @@
version portdir replaced_by license installs_libs} {
set keepkeys($key) 1
}
-mporttraverse pindex $directory
-if {[info exists oldfd]} {
- close $oldfd
+
+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
}
-close $fd
+if {$exit_fail} {
+ exit 1
+}
+
file rename -force $tempportindex $outpath
file mtime $outpath $newest
mports_generate_quickindex $outpath
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150412/89e409ae/attachment-0001.html>
More information about the macports-changes
mailing list