<!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>[138099] trunk/base/src</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/138099">138099</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-06-28 00:25:25 -0700 (Sun, 28 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>use in or ni operators where possible, rather than comparing the return value of lsearch with -1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcmacports10macports_dlisttcl">trunk/base/src/macports1.0/macports_dlist.tcl</a></li>
<li><a href="#trunkbasesrcport10portchecksumtcl">trunk/base/src/port1.0/portchecksum.tcl</a></li>
<li><a href="#trunkbasesrcport10portconfiguretcl">trunk/base/src/port1.0/portconfigure.tcl</a></li>
<li><a href="#trunkbasesrcport10portdestroottcl">trunk/base/src/port1.0/portdestroot.tcl</a></li>
<li><a href="#trunkbasesrcport10portlinttcl">trunk/base/src/port1.0/portlint.tcl</a></li>
<li><a href="#trunkbasesrcport10portlivechecktcl">trunk/base/src/port1.0/portlivecheck.tcl</a></li>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
<li><a href="#trunkbasesrcregistry20portimagetcl">trunk/base/src/registry2.0/portimage.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/macports1.0/macports.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> set fd [open $file r]
</span><span class="cx"> while {[gets $fd line] >= 0} {
</span><span class="cx"> if {[regexp {^(\w+)([ \t]+(.*))?$} $line match option ignore val] == 1} {
</span><del>- if {[lsearch -exact $bootstrap_options $option] >= 0} {
</del><ins>+ if {$option in $bootstrap_options} {
</ins><span class="cx"> set macports::$option [string trim $val]
</span><span class="cx"> global macports::$option
</span><span class="cx"> }
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> set fd [open $per_user r]
</span><span class="cx"> while {[gets $fd line] >= 0} {
</span><span class="cx"> if {[regexp {^(\w+)([ \t]+(.*))?$} $line match option ignore val] == 1} {
</span><del>- if {[lsearch -exact $user_options $option] >= 0} {
</del><ins>+ if {$option in $user_options} {
</ins><span class="cx"> set macports::$option $val
</span><span class="cx"> global macports::$option
</span><span class="cx"> }
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> if {[regexp {^([\w-]+://\S+)(?:\s+\[(\w+(?:,\w+)*)\])?$} $line _ url flags]} {
</span><span class="cx"> set flags [split $flags ,]
</span><span class="cx"> foreach flag $flags {
</span><del>- if {[lsearch -exact [list nosync default] $flag] == -1} {
</del><ins>+ if {$flag ni [list nosync default]} {
</ins><span class="cx"> ui_warn "$sources_conf source '$line' specifies invalid flag '$flag'"
</span><span class="cx"> }
</span><span class="cx"> if {$flag eq "default"} {
</span><span class="lines">@@ -1080,7 +1080,7 @@
</span><span class="cx">
</span><span class="cx"> set env_names [array names env]
</span><span class="cx"> foreach envkey $env_names {
</span><del>- if {[lsearch -exact $keepenvkeys $envkey] == -1} {
</del><ins>+ if {$envkey ni $keepenvkeys} {
</ins><span class="cx"> unset env($envkey)
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1088,7 +1088,7 @@
</span><span class="cx"> # unset environment an extra time, to work around bugs in Leopard Tcl
</span><span class="cx"> if {$macosx_version eq "10.5"} {
</span><span class="cx"> foreach envkey $env_names {
</span><del>- if {[lsearch -exact $keepenvkeys $envkey] == -1} {
</del><ins>+ if {$envkey ni $keepenvkeys} {
</ins><span class="cx"> unsetenv $envkey
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2206,13 +2206,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if {[llength $missing] > 0} {
</span><del>- if {[info exists dep_portinfo(variants)] && [lsearch -exact $dep_portinfo(variants) universal] != -1} {
</del><ins>+ if {[info exists dep_portinfo(variants)] && "universal" in $dep_portinfo(variants)} {
</ins><span class="cx"> # dep offers a universal variant
</span><span class="cx"> if {[llength $active_archs] == 1} {
</span><span class="cx"> # not installed universal
</span><span class="cx"> set missing {}
</span><span class="cx"> foreach arch $required_archs {
</span><del>- if {[lsearch -exact $macports::universal_archs $arch] == -1} {
</del><ins>+ if {$arch ni $macports::universal_archs} {
</ins><span class="cx"> lappend missing $arch
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2422,7 +2422,7 @@
</span><span class="cx"> foreach source $sources {
</span><span class="cx"> set flags [lrange $source 1 end]
</span><span class="cx"> set source [lindex $source 0]
</span><del>- if {[lsearch -exact $flags nosync] != -1} {
</del><ins>+ if {"nosync" in $flags} {
</ins><span class="cx"> ui_debug "Skipping $source"
</span><span class="cx"> continue
</span><span class="cx"> }
</span><span class="lines">@@ -3341,7 +3341,7 @@
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> foreach arch $required_archs {
</span><del>- if {[lsearch -exact $provided_archs $arch] == -1} {
</del><ins>+ if {$arch ni $provided_archs} {
</ins><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3397,7 +3397,7 @@
</span><span class="cx"> if {$supported_archs ne ""} {
</span><span class="cx"> set ss [expr {[llength $supported_archs] == 1 ? "" : "s"}]
</span><span class="cx"> foreach arch $required_archs {
</span><del>- if {[lsearch -exact $supported_archs $arch] == -1} {
</del><ins>+ if {$arch ni $supported_archs} {
</ins><span class="cx"> ui_error "its dependency $dep only supports the arch${ss} '$supported_archs'."
</span><span class="cx"> return
</span><span class="cx"> }
</span><span class="lines">@@ -3405,7 +3405,7 @@
</span><span class="cx"> }
</span><span class="cx"> if {$has_universal} {
</span><span class="cx"> foreach arch $required_archs {
</span><del>- if {[lsearch -exact $universal_archs $arch] == -1} {
</del><ins>+ if {$arch ni $universal_archs} {
</ins><span class="cx"> ui_error "its dependency $dep does not build for the required arch${s} by default"
</span><span class="cx"> ui_error "and the configured universal_archs '$universal_archs' are not sufficient."
</span><span class="cx"> return
</span><span class="lines">@@ -5088,7 +5088,7 @@
</span><span class="cx"> set fd [open $conf_file r]
</span><span class="cx"> while {[gets $fd line] >= 0} {
</span><span class="cx"> if {[regexp {^(\w+)([ \t]+(.*))?$} $line match option ignore val] == 1} {
</span><del>- if {[lsearch -exact $conf_options $option] >= 0} {
</del><ins>+ if {$option in $conf_options} {
</ins><span class="cx"> if {$option eq "name"} {
</span><span class="cx"> set cur_name $val
</span><span class="cx"> lappend all_names $val
</span></span></pre></div>
<a id="trunkbasesrcmacports10macports_dlisttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports_dlist.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports_dlist.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/macports1.0/macports_dlist.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> return [info exists [set ditem]($key)]
</span><span class="cx"> } else {
</span><span class="cx"> set x [lindex [array get $ditem $key] 1]
</span><del>- if {[llength $x] > 0 && [lsearch -exact $x [lindex $args 0]] != -1} {
</del><ins>+ if {[llength $x] > 0 && [lindex $args 0] in $x} {
</ins><span class="cx"> return 1
</span><span class="cx"> } else {
</span><span class="cx"> return 0
</span></span></pre></div>
<a id="trunkbasesrcport10portchecksumtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portchecksum.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portchecksum.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/port1.0/portchecksum.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if {[llength $all_dist_files] == 1
</span><span class="cx"> && [expr {$nb_checksum % 2}] == 0
</span><span class="cx"> && [expr {$nb_checksum / 2}] <= $checksum_types_count
</span><del>- && [lsearch -exact $checksum_types [lindex $checksums_str 0]] >= 0} {
</del><ins>+ && [lindex $checksums_str 0] in $checksum_types} {
</ins><span class="cx"> # Convert to format #2
</span><span class="cx"> set checksums_str [linsert $checksums_str 0 [lindex $all_dist_files 0]]
</span><span class="cx"> # We increased the size.
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> incr ix_checksum
</span><span class="cx"> while {1} {
</span><span class="cx"> set checksum_type [lindex $checksums_str $ix_checksum]
</span><del>- if {[lsearch -exact $checksum_types $checksum_type] >= 0} {
</del><ins>+ if {$checksum_type in $checksum_types} {
</ins><span class="cx"> # append the type and the value.
</span><span class="cx"> incr ix_checksum
</span><span class="cx"> set checksum_value [lindex $checksums_str $ix_checksum]
</span></span></pre></div>
<a id="trunkbasesrcport10portconfiguretcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portconfigure.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portconfigure.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/port1.0/portconfigure.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -325,16 +325,16 @@
</span><span class="cx"> }
</span><span class="cx"> set ret {}
</span><span class="cx"> foreach arch $archs {
</span><del>- if {[lsearch -exact $supported_archs $arch] != -1} {
</del><ins>+ if {$arch in $supported_archs} {
</ins><span class="cx"> set add_arch $arch
</span><del>- } elseif {$arch eq "x86_64" && [lsearch -exact $supported_archs "i386"] != -1} {
</del><ins>+ } elseif {$arch eq "x86_64" && "i386" in $supported_archs} {
</ins><span class="cx"> set add_arch "i386"
</span><del>- } elseif {$arch eq "ppc64" && [lsearch -exact $supported_archs "ppc"] != -1} {
</del><ins>+ } elseif {$arch eq "ppc64" && "ppc" in $supported_archs} {
</ins><span class="cx"> set add_arch "ppc"
</span><span class="cx"> } else {
</span><span class="cx"> continue
</span><span class="cx"> }
</span><del>- if {[lsearch -exact $ret $add_arch] == -1} {
</del><ins>+ if {$add_arch ni $ret} {
</ins><span class="cx"> lappend ret $add_arch
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcport10portdestroottcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portdestroot.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portdestroot.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/port1.0/portdestroot.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> if {$pfile eq "." || $pfile eq ".."} {
</span><span class="cx"> continue
</span><span class="cx"> }
</span><del>- if {[lsearch -exact $prefixPaths $pfile] == -1} {
</del><ins>+ if {$pfile ni $prefixPaths} {
</ins><span class="cx"> ui_warn "violation by [file join $dfile $pfile]"
</span><span class="cx"> set mtree_violation "yes"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcport10portlinttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portlint.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portlint.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/port1.0/portlint.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx">
</span><span class="cx"> if {[info exists platforms]} {
</span><span class="cx"> foreach platform $platforms {
</span><del>- if {[lsearch -exact $lint_platforms $platform] == -1} {
</del><ins>+ if {$platform ni $lint_platforms} {
</ins><span class="cx"> ui_error "Unknown platform: $platform"
</span><span class="cx"> incr errors
</span><span class="cx"> } else {
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx">
</span><span class="cx"> if {![info exists variantdesc] || $variantdesc eq ""} {
</span><span class="cx"> # don't warn about missing descriptions for global variants
</span><del>- if {[lsearch -exact $local_variants $variantname] != -1 &&
</del><ins>+ if {$variantname in $local_variants &&
</ins><span class="cx"> [variant_desc $porturl $variantname] eq ""} {
</span><span class="cx"> ui_warn "Variant $variantname does not have a description"
</span><span class="cx"> incr warnings
</span></span></pre></div>
<a id="trunkbasesrcport10portlivechecktcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portlivecheck.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portlivecheck.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/port1.0/portlivecheck.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if {[lsearch -exact [split $available_types "|"] ${livecheck.type}] != -1} {
</del><ins>+ if {${livecheck.type} in [split $available_types "|"]} {
</ins><span class="cx"> # Load the defaults from _resources/port1.0/livecheck/${livecheck.type}.tcl.
</span><span class="cx"> set defaults_file "$types_dir/${livecheck.type}.tcl"
</span><span class="cx"> ui_debug "Loading the defaults from '$defaults_file'"
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/port1.0/portutil.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -702,8 +702,7 @@
</span><span class="cx"> # determine if a variant exists.
</span><span class="cx"> proc variant_exists {name} {
</span><span class="cx"> global PortInfo
</span><del>- if {[info exists PortInfo(variants)] &&
- [lsearch -exact $PortInfo(variants) $name] >= 0} {
</del><ins>+ if {[info exists PortInfo(variants)] && $name in $PortInfo(variants)} {
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -814,7 +813,7 @@
</span><span class="cx"> proc subport {subname body} {
</span><span class="cx"> global subport name PortInfo
</span><span class="cx"> if {$subport eq $name && $subname ne $name &&
</span><del>- (![info exists PortInfo(subports)] || [lsearch -exact $PortInfo(subports) $subname] == -1)} {
</del><ins>+ (![info exists PortInfo(subports)] || $subname ni $PortInfo(subports))} {
</ins><span class="cx"> lappend PortInfo(subports) $subname
</span><span class="cx"> }
</span><span class="cx"> if {[string equal -nocase $subname $subport]} {
</span><span class="lines">@@ -1395,7 +1394,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Of course, if this is a dry run, don't do the task:
</span><del>- if {[tbool ports_dryrun] && [lsearch -exact $dryrun_allow_targets $targetname] == -1} {
</del><ins>+ if {[tbool ports_dryrun] && $targetname ni $dryrun_allow_targets} {
</ins><span class="cx"> # only one message per portname
</span><span class="cx"> if {$portname != $ports_dry_last_skipped} {
</span><span class="cx"> ui_notice "For $portname: skipping $targetname (dry run)"
</span><span class="lines">@@ -1489,11 +1488,9 @@
</span><span class="cx">
</span><span class="cx"> # If portname is empty, the dependency is already satisfied by other means,
</span><span class="cx"> # for example a bin: dependency on a file not installed by MacPorts
</span><del>- if {$name ne ""} {
- if {[lsearch -exact $deplist $name] == -1} {
- lappend deplist $name
- set deplist [recursive_collect_deps $name $deplist]
- }
</del><ins>+ if {$name ne "" && $name ni $deplist} {
+ lappend deplist $name
+ set deplist [recursive_collect_deps $name $deplist]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1629,7 +1626,7 @@
</span><span class="cx">
</span><span class="cx"> foreach item $deplist {
</span><span class="cx"> set name [lindex $item 0]
</span><del>- if {[lsearch -exact $depsfound $name] == -1} {
</del><ins>+ if {$name ni $depsfound} {
</ins><span class="cx"> lappend depsfound $name
</span><span class="cx"> set depsfound [recursive_collect_deps $name $depsfound]
</span><span class="cx"> }
</span><span class="lines">@@ -2048,7 +2045,7 @@
</span><span class="cx"> array set requested_variations [array get upvariations]
</span><span class="cx"> foreach key [array names upvariations *] {
</span><span class="cx"> if {![info exists PortInfo(variants)] ||
</span><del>- [lsearch $PortInfo(variants) $key] == -1} {
</del><ins>+ $key ni $PortInfo(variants)} {
</ins><span class="cx"> ui_debug "Requested variant $upvariations($key)$key is not provided by port $portname."
</span><span class="cx"> array unset upvariations $key
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcregistry20portimagetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/portimage.tcl (138098 => 138099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/portimage.tcl 2015-06-28 07:13:39 UTC (rev 138098)
+++ trunk/base/src/registry2.0/portimage.tcl 2015-06-28 07:25:25 UTC (rev 138099)
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx"> # we'll set the directory attributes properly for all
</span><span class="cx"> # directories.
</span><span class="cx"> set directory [::file dirname $file]
</span><del>- while { [lsearch -exact $files $directory] == -1 } {
</del><ins>+ while {$directory ni $files} {
</ins><span class="cx"> lappend files $directory
</span><span class="cx"> set directory [::file dirname $directory]
</span><span class="cx"> }
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx">
</span><span class="cx"> # Split out the filename's subpaths and add them to the image list
</span><span class="cx"> # as well.
</span><del>- while { [lsearch -exact $files $directory] == -1 } {
</del><ins>+ while {$directory ni $files} {
</ins><span class="cx"> lappend files $directory
</span><span class="cx"> set directory [::file dirname $directory]
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>