<!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>[125619] trunk/base/src/macports1.0</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/125619">125619</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-09-22 16:28:41 -0700 (Mon, 22 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>use eq/ne for string comparisons in macports1.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10doctortcl">trunk/base/src/macports1.0/doctor.tcl</a></li>
<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="#trunkbasesrcmacports10testsmacportstest">trunk/base/src/macports1.0/tests/macports.test</a></li>
<li><a href="#trunkbasesrcmacports10testsmacports_dlisttest">trunk/base/src/macports1.0/tests/macports_dlist.test</a></li>
<li><a href="#trunkbasesrcmacports10testsmacports_utiltest">trunk/base/src/macports1.0/tests/macports_util.test</a></li>
<li><a href="#trunkbasesrcmacports10teststesttcl">trunk/base/src/macports1.0/tests/test.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10doctortcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/doctor.tcl (125618 => 125619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/doctor.tcl 2014-09-22 23:02:06 UTC (rev 125618)
+++ trunk/base/src/macports1.0/doctor.tcl 2014-09-22 23:28:41 UTC (rev 125619)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> set version ${macports::macosx_version}
</span><span class="cx">
</span><del>- if {$version == 10.9} {
</del><ins>+ if {$version eq "10.9"} {
</ins><span class="cx">
</span><span class="cx"> if {![file exists "/Library/Developer/CommandLineTools/"]} {
</span><span class="cx">
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">
</span><span class="cx"> set mac_version ${macports::macosx_version}
</span><span class="cx">
</span><del>- if {$mac_version == 10.6} {
</del><ins>+ if {$mac_version eq "10.6"} {
</ins><span class="cx">
</span><span class="cx"> if {[file exists /Applications/X11.app]} {
</span><span class="cx"> ui_error "it seems you have Mac OSX 10.6 installed, and are using X11 from \"X11.app\". This has been known to cause issues. \
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx">
</span><span class="cx"> if {"$port_loc/bin" in $split && "$port_loc/sbin" in $split } {
</span><span class="cx">
</span><del>- if {[lindex $split 0] != "$port_loc/bin"} {
</del><ins>+ if {[lindex $split 0] ne "$port_loc/bin"} {
</ins><span class="cx"> ui_warn "$port_loc/bin is not first in your PATH environmental variable. This may or may not \
</span><span class="cx"> cause problems in the future."
</span><span class="cx"> }
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> Would you like to add $port_loc/bin to your \$PATH variable now? \[Y/N\]"
</span><span class="cx"> set input [gets stdin]
</span><span class="cx">
</span><del>- if {$input == "y" || $input == "Y"} {
</del><ins>+ if {$input eq "y" || $input eq "Y"} {
</ins><span class="cx"> ui_msg "Attempting to add $port_loc/bin to $profile_path"
</span><span class="cx">
</span><span class="cx"> if {[file exists $profile_path] == 1} {
</span><span class="lines">@@ -731,7 +731,7 @@
</span><span class="cx">
</span><span class="cx"> ui_msg "Added PATH properly. Please execute, 'source $profile_path' in a new terminal window."
</span><span class="cx">
</span><del>- } elseif {$input == "n" || $input == "N"} {
</del><ins>+ } elseif {$input eq "n" || $input eq "N"} {
</ins><span class="cx"> ui_msg "Not fixing your \$PATH variable."
</span><span class="cx">
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (125618 => 125619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2014-09-22 23:02:06 UTC (rev 125618)
+++ trunk/base/src/macports1.0/macports.tcl 2014-09-22 23:28:41 UTC (rev 125619)
</span><span class="lines">@@ -1878,8 +1878,8 @@
</span><span class="cx"> set revision [lindex $i 2]
</span><span class="cx"> set variants [lindex $i 3]
</span><span class="cx"> array set portinfo [mportinfo $mport]
</span><del>- if {$name eq $portinfo(name) && $version == $portinfo(version)
- && $revision == $portinfo(revision) && $variants == $portinfo(canonical_active_variants)} {
</del><ins>+ if {$name eq $portinfo(name) && $version eq $portinfo(version)
+ && $revision == $portinfo(revision) && $variants eq $portinfo(canonical_active_variants)} {
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3819,7 +3819,7 @@
</span><span class="cx"> set version [lindex $i 1]
</span><span class="cx"> set revision [lindex $i 2]
</span><span class="cx"> set epoch [lindex $i 5]
</span><del>- if {$version_installed eq {} || ($epoch > $epoch_installed && $version != $version_installed) ||
</del><ins>+ if {$version_installed eq {} || ($epoch > $epoch_installed && $version ne $version_installed) ||
</ins><span class="cx"> ($epoch >= $epoch_installed && [vercmp $version $version_installed] > 0)
</span><span class="cx"> || ($epoch >= $epoch_installed
</span><span class="cx"> && [vercmp $version $version_installed] == 0
</span><span class="lines">@@ -3965,14 +3965,14 @@
</span><span class="cx"> && ![info exists options(ports_upgrade_force)]} {
</span><span class="cx"> if {$portname ne $newname} {
</span><span class="cx"> ui_debug "ignoring versions, installing replacement port"
</span><del>- } elseif {$epoch_installed < $epoch_in_tree && $version_installed != $version_in_tree} {
</del><ins>+ } elseif {$epoch_installed < $epoch_in_tree && $version_installed ne $version_in_tree} {
</ins><span class="cx"> set build_override 1
</span><span class="cx"> ui_debug "epoch override ... upgrading!"
</span><span class="cx"> } elseif {[info exists options(ports_upgrade_enforce-variants)] && $options(ports_upgrade_enforce-variants) eq {yes}
</span><del>- && [info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) != $oldvariant} {
</del><ins>+ && [info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) ne $oldvariant} {
</ins><span class="cx"> ui_debug "variant override ... upgrading!"
</span><span class="cx"> } elseif {$os_platform_installed ne {} && $os_major_installed ne {} && $os_platform_installed != 0
</span><del>- && ([_mportkey $mport {{os.platform}}] != $os_platform_installed
</del><ins>+ && ([_mportkey $mport {{os.platform}}] ne $os_platform_installed
</ins><span class="cx"> || [_mportkey $mport {{os.major}}] != $os_major_installed)} {
</span><span class="cx"> ui_debug "platform mismatch ... upgrading!"
</span><span class="cx"> set build_override 1
</span><span class="lines">@@ -3984,7 +3984,7 @@
</span><span class="cx"> # in the first run of rev-upgrade, only activate possibly already existing files and check for missing dependencies
</span><span class="cx"> # do nothing, just prevent will_install being set to no below
</span><span class="cx"> } else {
</span><del>- if {[info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) != $oldvariant} {
</del><ins>+ if {[info exists portinfo(canonical_active_variants)] && $portinfo(canonical_active_variants) ne $oldvariant} {
</ins><span class="cx"> if {[llength $variationslist] > 0} {
</span><span class="cx"> ui_warn "Skipping upgrade since $portname ${version_installed}_$revision_installed >= $portname ${version_in_tree}_${revision_in_tree}, even though installed variants \"$oldvariant\" do not match \"$portinfo(canonical_active_variants)\". Use 'upgrade --enforce-variants' to switch to the requested variants."
</span><span class="cx"> } else {
</span><span class="lines">@@ -4113,8 +4113,8 @@
</span><span class="cx"> if {!$force_cur} {
</span><span class="cx"> unset options(ports_force)
</span><span class="cx"> }
</span><del>- if {$anyactive && $version_in_tree == $version_active && $revision_in_tree == $revision_active
- && $portinfo(canonical_active_variants) == $variant_active && $portname eq $newname} {
</del><ins>+ if {$anyactive && $version_in_tree eq $version_active && $revision_in_tree == $revision_active
+ && $portinfo(canonical_active_variants) eq $variant_active && $portname eq $newname} {
</ins><span class="cx"> set anyactive no
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4194,7 +4194,7 @@
</span><span class="cx"> set version [lindex $i 1]
</span><span class="cx"> set revision [lindex $i 2]
</span><span class="cx"> set variant [lindex $i 3]
</span><del>- if {$version == $version_in_tree && $revision == $revision_in_tree && $variant == $portinfo(canonical_active_variants) && $portname eq $newname} {
</del><ins>+ if {$version eq $version_in_tree && $revision == $revision_in_tree && $variant eq $portinfo(canonical_active_variants) && $portname eq $newname} {
</ins><span class="cx"> continue
</span><span class="cx"> }
</span><span class="cx"> set epoch [lindex $i 5]
</span></span></pre></div>
<a id="trunkbasesrcmacports10macports_dlisttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports_dlist.tcl (125618 => 125619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports_dlist.tcl 2014-09-22 23:02:06 UTC (rev 125618)
+++ trunk/base/src/macports1.0/macports_dlist.tcl 2014-09-22 23:28:41 UTC (rev 125619)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> while {1} {
</span><span class="cx"> set ditem [$selector $dlist statusdict]
</span><span class="cx">
</span><del>- if {$ditem == {}} {
</del><ins>+ if {$ditem eq {}} {
</ins><span class="cx"> if {[llength $dlist] > 0} {
</span><span class="cx"> ui_debug "dlist_eval: all entries in dependency list have unsatisfied dependencies; can't process"
</span><span class="cx"> }
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> return $dlist
</span><span class="cx"> }
</span><span class="cx"> # No news is good news at this point.
</span><del>- if {$result == {}} { set result 0 }
</del><ins>+ if {$result eq {}} { set result 0 }
</ins><span class="cx">
</span><span class="cx"> foreach token [ditem_key $ditem provides] {
</span><span class="cx"> set statusdict($token) [expr {$result == 0}]
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> proc ditem_append {ditem key args} {
</span><span class="cx"> variable $ditem
</span><span class="cx"> set x [lindex [array get $ditem $key] 1]
</span><del>- if {$x != {}} {
</del><ins>+ if {$x ne {}} {
</ins><span class="cx"> lappend x {*}$args
</span><span class="cx"> } else {
</span><span class="cx"> set x $args
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> proc ditem_append_unique {ditem key args} {
</span><span class="cx"> variable $ditem
</span><span class="cx"> set x [lindex [array get $ditem $key] 1]
</span><del>- if {$x != {}} {
</del><ins>+ if {$x ne {}} {
</ins><span class="cx"> lappend x {*}$args
</span><span class="cx"> set x [lsort -unique $x]
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbasesrcmacports10testsmacportstest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/macports.test (125618 => 125619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/tests/macports.test 2014-09-22 23:02:06 UTC (rev 125618)
+++ trunk/base/src/macports1.0/tests/macports.test 2014-09-22 23:28:41 UTC (rev 125619)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> if {[catch {mportclose $mport}] != 0} {
</span><span class="cx"> return "FAIL: cannot run mportclose"
</span><span class="cx"> }
</span><del>- if {[ditem_key $mport workername] != ""} {
</del><ins>+ if {[ditem_key $mport workername] ne ""} {
</ins><span class="cx"> return "FAIL: port not closed"
</span><span class="cx"> }
</span><span class="cx"> return "Mport close successful."
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> if {[macports::init_logging $mport] != 0} {
</span><span class="cx"> return "FAIL: incorrect channels"
</span><span class="cx"> }
</span><del>- if {$macports::channels(any) != "stdout debuglog"} {
</del><ins>+ if {$macports::channels(any) ne "stdout debuglog"} {
</ins><span class="cx"> return "FAIL: incorrect channels(any)"
</span><span class="cx"> }
</span><span class="cx"> if {(![info exists ui_options(ports_debug)] && $macports::channels(debug) ne "debuglog") ||
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> }
</span><span class="cx"> } -body {
</span><span class="cx"> macports::pop_log
</span><del>- if {$::debuglog != $::logstack} {
</del><ins>+ if {$::debuglog ne $::logstack} {
</ins><span class="cx"> return "FAIL: cannot pop log"
</span><span class="cx"> }
</span><span class="cx"> return "Pop log successful."
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> Set phase unit test.
</span><span class="cx"> } -body {
</span><span class="cx"> set res [set_phase test]
</span><del>- if {$macports::current_phase != "test"} {
</del><ins>+ if {$macports::current_phase ne "test"} {
</ins><span class="cx"> return "FAIL: phase not set"
</span><span class="cx"> }
</span><span class="cx"> return "Set phase successful."
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> close $fd2
</span><span class="cx"> set fd2 [open $pwd/message r]
</span><span class="cx"> set line [read $fd2]
</span><del>- if {$line != "prefixargs\n"} {
</del><ins>+ if {$line ne "prefixargs\n"} {
</ins><span class="cx"> return "FAIL: wrong message"
</span><span class="cx"> }
</span><span class="cx"> close $fd2
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> close $fd2
</span><span class="cx"> set fd2 [open $pwd/log r]
</span><span class="cx"> set line [read $fd2]
</span><del>- if {$line != "prefixarg"} {
</del><ins>+ if {$line ne "prefixarg"} {
</ins><span class="cx"> return "FAIL: wrong message"
</span><span class="cx"> }
</span><span class="cx"> close $fd2
</span><span class="lines">@@ -354,10 +354,10 @@
</span><span class="cx"> test findBinary {
</span><span class="cx"> Find binary unit test.
</span><span class="cx"> } -body {
</span><del>- if {[macports::findBinary pwd ls] != "/bin/pwd"} {
</del><ins>+ if {[macports::findBinary pwd ls] ne "/bin/pwd"} {
</ins><span class="cx"> return "FAIL: wrong binary"
</span><span class="cx"> }
</span><del>- if {[macports::findBinary pwd /bin/ls] != "/bin/ls"} {
</del><ins>+ if {[macports::findBinary pwd /bin/ls] ne "/bin/ls"} {
</ins><span class="cx"> return "FAIL: wrong binary"
</span><span class="cx"> }
</span><span class="cx"> return "Find binary successful."
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> if {[catch {macports::binaryInPath zz}] != 1} {
</span><span class="cx"> return "FAIL: invalid binary found"
</span><span class="cx"> }
</span><del>- if {[macports::binaryInPath ls] != "/bin/ls"} {
</del><ins>+ if {[macports::binaryInPath ls] ne "/bin/ls"} {
</ins><span class="cx"> return "FAIL: wrong binary found"
</span><span class="cx"> }
</span><span class="cx"> return "Binary in path successful."
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> Get option unit test.
</span><span class="cx"> } -body {
</span><span class="cx"> set macports::test macports
</span><del>- if {[macports::getoption test] != "macports"} {
</del><ins>+ if {[macports::getoption test] ne "macports"} {
</ins><span class="cx"> return "FAIL: cannot get option"
</span><span class="cx"> }
</span><span class="cx"> return "Get option successful."
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> unset macports::xcodeversion
</span><span class="cx"> } -body {
</span><del>- if {[macports::setxcodeinfo a b c] != ""} {
</del><ins>+ if {[macports::setxcodeinfo a b c] ne ""} {
</ins><span class="cx"> return "FAIL: xcode binary not found"
</span><span class="cx"> }
</span><span class="cx"> if {![info exists macports::xcodeversion]} {
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> } -body {
</span><span class="cx"> unset macports::developer_dir
</span><span class="cx">
</span><del>- if {[macports::set_developer_dir a b c] != ""} {
</del><ins>+ if {[macports::set_developer_dir a b c] ne ""} {
</ins><span class="cx"> return "FAIL: cannot set dev dir"
</span><span class="cx"> }
</span><span class="cx"> if {![info exists macports::developer_dir]} {
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> close [open $macports::portdbpath/pingtimes w+]
</span><span class="cx">
</span><span class="cx"> } -body {
</span><del>- if {[mportshutdown] != ""} {
</del><ins>+ if {[mportshutdown] ne ""} {
</ins><span class="cx"> return "FAIL: errors occured"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -508,7 +508,7 @@
</span><span class="cx"> append res "host1 \{test " $time "\}"
</span><span class="cx"> set fd [open $macports::portdbpath/pingtimes r]
</span><span class="cx">
</span><del>- if {[gets $fd] != $res} {
</del><ins>+ if {[gets $fd] ne $res} {
</ins><span class="cx"> return "FAIL: wrong value saved"
</span><span class="cx"> }
</span><span class="cx"> close $fd
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> } -body {
</span><span class="cx"> set target $pwd/target
</span><span class="cx">
</span><del>- if {[macports::copy_xcode_plist $target] != ""} {
</del><ins>+ if {[macports::copy_xcode_plist $target] ne ""} {
</ins><span class="cx"> return "FAIL: cannot copy xcode plist"
</span><span class="cx"> }
</span><span class="cx"> if {![file exists $target/Library/Preferences/com.apple.dt.Xcode.plist]} {
</span><span class="lines">@@ -555,10 +555,10 @@
</span><span class="cx"> test get_tar_flags {
</span><span class="cx"> Get tar flags unit test.
</span><span class="cx"> } -body {
</span><del>- if {[macports::get_tar_flags .tbz2] != "-j"} {
</del><ins>+ if {[macports::get_tar_flags .tbz2] ne "-j"} {
</ins><span class="cx"> return "FAIL: wrong flaga (-j)"
</span><span class="cx"> }
</span><del>- if {[macports::get_tar_flags .tgz] != "-z"} {
</del><ins>+ if {[macports::get_tar_flags .tgz] ne "-z"} {
</ins><span class="cx"> return "FAIL: wrong flaga (-z)"
</span><span class="cx"> }
</span><span class="cx"> return "Get tar flags successful."
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx"> } -body {
</span><span class="cx"> set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
</span><span class="cx"> set res [macports::fetch_port $url]
</span><del>- if {$res != "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
</del><ins>+ if {$res ne "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
</ins><span class="cx"> return "FAIL: cannot fetch port"
</span><span class="cx"> }
</span><span class="cx"> return "Fetch port successful."
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx"> test getprotocol {
</span><span class="cx"> Get protocol unit test.
</span><span class="cx"> } -body {
</span><del>- if {[macports::getprotocol http://www.macports.org] != "http"} {
</del><ins>+ if {[macports::getprotocol http://www.macports.org] ne "http"} {
</ins><span class="cx"> return "FAIL: wrong protocol"
</span><span class="cx"> }
</span><span class="cx"> return "Get protocol successful."
</span><span class="lines">@@ -596,12 +596,12 @@
</span><span class="cx"> } -body {
</span><span class="cx"> set url http://packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2
</span><span class="cx"> set res [macports::getportdir $url]
</span><del>- if {$res != "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
</del><ins>+ if {$res ne "${pwd}/portdbpath/portdirs/db_select-0.1_2"} {
</ins><span class="cx"> return "FAIL: invalid port directory"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set url file://${pwd}/local_file
</span><del>- if {[macports::getportdir $url] != "${pwd}/local_file"} {
</del><ins>+ if {[macports::getportdir $url] ne "${pwd}/local_file"} {
</ins><span class="cx"> return "FAIL: invalid local port directory"
</span><span class="cx"> }
</span><span class="cx"> return "Get port dir successful."
</span><span class="lines">@@ -619,13 +619,13 @@
</span><span class="cx"> set default_path $pwd/portdbpath/sources/rsync.macports.org/release/tarballs/ports/_resources
</span><span class="cx"> set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_2.darwin_13.noarch.tbz2/_resources
</span><span class="cx">
</span><del>- if {[macports::getportresourcepath $url "" yes] != $default_path} {
</del><ins>+ if {[macports::getportresourcepath $url "" yes] ne $default_path} {
</ins><span class="cx"> return "FAIL: wrong resource path"
</span><span class="cx"> }
</span><del>- if {[macports::getportresourcepath $url "" no] != $fallback_path} {
</del><ins>+ if {[macports::getportresourcepath $url "" no] ne $fallback_path} {
</ins><span class="cx"> return "FAIL: wrong fallback path"
</span><span class="cx"> }
</span><del>- if {[macports::getportresourcepath $url "test" no] != "${fallback_path}/test"} {
</del><ins>+ if {[macports::getportresourcepath $url "test" no] ne "${fallback_path}/test"} {
</ins><span class="cx"> return "FAIL: wrong fallback path with subdir"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -638,14 +638,14 @@
</span><span class="cx"> } -body {
</span><span class="cx"> set path test/path
</span><span class="cx"> set macports::sources_default file://$pwd
</span><del>- if {[macports::getdefaultportresourcepath $path] != "${pwd}/_resources/${path}"} {
</del><ins>+ if {[macports::getdefaultportresourcepath $path] ne "${pwd}/_resources/${path}"} {
</ins><span class="cx"> return "FAIL: wrong file res path"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set macports::sources_default http://$pwd
</span><span class="cx"> set default_source_url [lindex ${macports::sources_default} 0]
</span><span class="cx"> set right_path [macports::getsourcepath $default_source_url]/_resources/test/path
</span><del>- if {[macports::getdefaultportresourcepath $path] != $right_path} {
</del><ins>+ if {[macports::getdefaultportresourcepath $path] ne $right_path} {
</ins><span class="cx"> return "FAIL: wrong http res path"
</span><span class="cx"> }
</span><span class="cx"> return "Default res path successful."
</span><span class="lines">@@ -678,7 +678,7 @@
</span><span class="cx"> set res ""
</span><span class="cx"> } -body {
</span><span class="cx"> mporttraverse test_proc $pwd/porttree
</span><del>- if {$res != "1.01.0"} {
</del><ins>+ if {$res ne "1.01.0"} {
</ins><span class="cx"> return "FAIL: porttree not traversed"
</span><span class="cx"> }
</span><span class="cx"> return "Mport traverse successful."
</span><span class="lines">@@ -825,16 +825,16 @@
</span><span class="cx"> puts $fd "a\nb"
</span><span class="cx"> close $fd
</span><span class="cx"> } -body {
</span><del>- if {[mportselect list group] != {file1 file2}} {
</del><ins>+ if {[mportselect list group] ne {file1 file2}} {
</ins><span class="cx"> return "FAIL: files not listed"
</span><span class="cx"> }
</span><del>- if {[mportselect set group file1] != ""} {
</del><ins>+ if {[mportselect set group file1] ne ""} {
</ins><span class="cx"> reutrn "FAIL: cannot set links"
</span><span class="cx"> }
</span><span class="cx"> if {![file exists $macports::prefix/a]} {
</span><span class="cx"> return "FAIL: link not created"
</span><span class="cx"> }
</span><del>- if {[mportselect show group] != "file1"} {
</del><ins>+ if {[mportselect show group] ne "file1"} {
</ins><span class="cx"> return "FAIL: file not selected"
</span><span class="cx"> }
</span><span class="cx"> return "Mport select successful."
</span><span class="lines">@@ -849,11 +849,11 @@
</span><span class="cx"> } -body {
</span><span class="cx"> global env
</span><span class="cx"> set env(TMPDIR) temporal
</span><del>- if {[macports::gettmpdir] != "temporal"} {
</del><ins>+ if {[macports::gettmpdir] ne "temporal"} {
</ins><span class="cx"> return "FAIL: set temp dir not detected"
</span><span class="cx"> }
</span><span class="cx"> unset env(TMPDIR)
</span><del>- if {[macports::gettmpdir] != "/tmp"} {
</del><ins>+ if {[macports::gettmpdir] ne "/tmp"} {
</ins><span class="cx"> return "FAIL: default value not set"
</span><span class="cx"> }
</span><span class="cx"> return "Get tmp dir successful."
</span><span class="lines">@@ -914,11 +914,11 @@
</span><span class="cx"> Revupgrade handle special paths unit test.
</span><span class="cx"> } -body {
</span><span class="cx"> set res [macports::revupgrade_handle_special_paths fname test_path]
</span><del>- if {$res != "test_path"} {
</del><ins>+ if {$res ne "test_path"} {
</ins><span class="cx"> return "FAIL: wrong path"
</span><span class="cx"> }
</span><span class="cx"> set res [macports::revupgrade_handle_special_paths fname @loader_path/test_load]
</span><del>- if {$res != "./test_load"} {
</del><ins>+ if {$res ne "./test_load"} {
</ins><span class="cx"> return "FAIL: wrong load path"
</span><span class="cx"> }
</span><span class="cx"> return "Revupgrade handle special path successful."
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx"> set macports::host_preferred(macports_pref) [list pref $time]
</span><span class="cx">
</span><span class="cx"> } -body {
</span><del>- if {[macports::get_pingtime macports.org] != "MacPorts"} {
</del><ins>+ if {[macports::get_pingtime macports.org] ne "MacPorts"} {
</ins><span class="cx"> return "FAIL: wrong ping time"
</span><span class="cx"> }
</span><span class="cx"> if {[macports::get_pingtime macports_blacklist] != -1} {
</span><span class="lines">@@ -976,15 +976,15 @@
</span><span class="cx"> } -body {
</span><span class="cx"> set res [macports::get_archive_sites_conf_values]
</span><span class="cx"> puts $res
</span><del>- if {[lindex [split $res " "] 1] != "macports.org:nosubdir"} {
</del><ins>+ if {[lindex [split $res " "] 1] ne "macports.org:nosubdir"} {
</ins><span class="cx"> return "FAIL: name not set"
</span><span class="cx"> }
</span><del>- if {[lindex [split $res " "] 3] != "tgz"} {
</del><ins>+ if {[lindex [split $res " "] 3] ne "tgz"} {
</ins><span class="cx"> return "FAIL: wrong type set"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set macports::archive_sites_conf_values {a b c}
</span><del>- if {[macports::get_archive_sites_conf_values] != {a b c}} {
</del><ins>+ if {[macports::get_archive_sites_conf_values] ne {a b c}} {
</ins><span class="cx"> return "FAIL: wrong result for bad conf file"
</span><span class="cx"> }
</span><span class="cx"> return "Get archive sites conf values successful."
</span></span></pre></div>
<a id="trunkbasesrcmacports10testsmacports_dlisttest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/macports_dlist.test (125618 => 125619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/tests/macports_dlist.test 2014-09-22 23:02:06 UTC (rev 125618)
+++ trunk/base/src/macports1.0/tests/macports_dlist.test 2014-09-22 23:28:41 UTC (rev 125619)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> set crit2 { provides fondu2 }
</span><span class="cx">
</span><span class="cx"> } -body {
</span><del>- if {[dlist_match_multi $mport $crit] != $mport} {
</del><ins>+ if {[dlist_match_multi $mport $crit] ne $mport} {
</ins><span class="cx"> return "FAIL: correct dlist not matched"
</span><span class="cx"> }
</span><del>- if {[dlist_match_multi $mport $crit2] != ""} {
</del><ins>+ if {[dlist_match_multi $mport $crit2] ne ""} {
</ins><span class="cx"> return "FAIL: incorrect dlist matched"
</span><span class="cx"> }
</span><span class="cx"> return "dlist match successful."
</span><span class="lines">@@ -43,10 +43,10 @@
</span><span class="cx"> } -setup {
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="cx"> } -body {
</span><del>- if {[dlist_search $mport provides gcc_select] != $mport} {
</del><ins>+ if {[dlist_search $mport provides gcc_select] ne $mport} {
</ins><span class="cx"> return "FAIL: matching item not found"
</span><span class="cx"> }
</span><del>- if {[dlist_search $mport provides fondu2] != ""} {
</del><ins>+ if {[dlist_search $mport provides fondu2] ne ""} {
</ins><span class="cx"> return "FAIL: wrong item detected"
</span><span class="cx"> }
</span><span class="cx"> return "dlist successful."
</span><span class="lines">@@ -62,10 +62,10 @@
</span><span class="cx"> set dlist [list]
</span><span class="cx"> lappend dlist $mport
</span><span class="cx"> } -body {
</span><del>- if {[dlist_delete dlist $mport] != ""} {
</del><ins>+ if {[dlist_delete dlist $mport] ne ""} {
</ins><span class="cx"> return "FAIL: cannot run dlist_delete"
</span><span class="cx"> }
</span><del>- if {$dlist != ""} {
</del><ins>+ if {$dlist ne ""} {
</ins><span class="cx"> return "FAIL: port not removed from list"
</span><span class="cx"> }
</span><span class="cx"> return "Dlist delete successful."
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="cx"> set result {fondu2}
</span><span class="cx"> } -body {
</span><del>- if {[dlist_append_dependents $mport provides $result] != {fondu2 provides}} {
</del><ins>+ if {[dlist_append_dependents $mport provides $result] ne {fondu2 provides}} {
</ins><span class="cx"> return "FAIL: wrong depends"
</span><span class="cx"> }
</span><span class="cx"> return "Append depends successful."
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> set mport [mportopen file://.]
</span><span class="cx"> set dict {gcc_select}
</span><span class="cx"> } -body {
</span><del>- if {[dlist_get_next $mport $dict] != $mport} {
</del><ins>+ if {[dlist_get_next $mport $dict] ne $mport} {
</ins><span class="cx"> return "FAIL: wrong dlist"
</span><span class="cx"> }
</span><span class="cx"> return "dlist get next successful."
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> }
</span><span class="cx"> proc handler {arg} {}
</span><span class="cx"> } -body {
</span><del>- if {[dlist_eval $mport cond handler] != ""} {
</del><ins>+ if {[dlist_eval $mport cond handler] ne ""} {
</ins><span class="cx"> return "FAIL: wrong value returned"
</span><span class="cx"> }
</span><span class="cx"> return "dlist eval successful."
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> set res [macports_dlist::ditem_create]
</span><span class="cx"> macports_dlist::ditem_key $res macports test
</span><span class="cx"> } -body {
</span><del>- if {[array get macports_dlist::$res macports] != "macports test"} {
</del><ins>+ if {[array get macports_dlist::$res macports] ne "macports test"} {
</ins><span class="cx"> return "FAIL ditem key not set"
</span><span class="cx"> }
</span><span class="cx"> return "Ditem key successful."
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> macports_dlist::ditem_key $res macports test
</span><span class="cx"> macports_dlist::ditem_append $res macports test2
</span><span class="cx"> } -body {
</span><del>- if {[array get macports_dlist::$res macports] != "macports {test test2}"} {
</del><ins>+ if {[array get macports_dlist::$res macports] ne "macports {test test2}"} {
</ins><span class="cx"> return "FAIL: ditem key not appended"
</span><span class="cx"> }
</span><span class="cx"> return "Ditem key append successful."
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> macports_dlist::ditem_key $res macports test
</span><span class="cx"> macports_dlist::ditem_append_unique $res macports test
</span><span class="cx"> } -body {
</span><del>- if {[array get macports_dlist::$res macports] != "macports test"} {
</del><ins>+ if {[array get macports_dlist::$res macports] ne "macports test"} {
</ins><span class="cx"> return "FAIL: ditem key not unique"
</span><span class="cx"> }
</span><span class="cx"> return "Ditem append unique successful."
</span></span></pre></div>
<a id="trunkbasesrcmacports10testsmacports_utiltest"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/macports_util.test (125618 => 125619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/tests/macports_util.test 2014-09-22 23:02:06 UTC (rev 125618)
+++ trunk/base/src/macports1.0/tests/macports_util.test 2014-09-22 23:28:41 UTC (rev 125619)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> if {[test_proc 1] != 7} {
</span><span class="cx"> return "FAIL: no wrap around method"
</span><span class="cx"> }
</span><del>- if {[test_proc arg] != "arg"} {
</del><ins>+ if {[test_proc arg] ne "arg"} {
</ins><span class="cx"> return "FAIL: no wrap around method"
</span><span class="cx"> }
</span><span class="cx"> return "Method wrap successful."
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> if {[ldindex list] != {0 2 3}} {
</span><span class="cx"> return "FAIL: not all elements poped"
</span><span class="cx"> }
</span><del>- if {$list != ""} {
</del><ins>+ if {$list ne ""} {
</ins><span class="cx"> return "FAIL: list not emptied"
</span><span class="cx"> }
</span><span class="cx"> return "ldindex successful."
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> if {$list != {1 2}} {
</span><span class="cx"> return "FAIL: wrong list remaining"
</span><span class="cx"> }
</span><del>- if {[lshift list1] != ""} {
</del><ins>+ if {[lshift list1] ne ""} {
</ins><span class="cx"> return "FAIL: empty list not detected"
</span><span class="cx"> }
</span><span class="cx"> return "lshift successful."
</span></span></pre></div>
<a id="trunkbasesrcmacports10teststesttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/tests/test.tcl (125618 => 125619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/tests/test.tcl 2014-09-22 23:02:06 UTC (rev 125618)
+++ trunk/base/src/macports1.0/tests/test.tcl 2014-09-22 23:28:41 UTC (rev 125619)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> set result [exec -ignorestderr $tcl $test {*}$arguments]
</span><span class="cx"> set lastline [lindex [split $result "\n"] end]
</span><span class="cx">
</span><del>- if {[lrange [split $lastline "\t"] 1 1] != "Total"} {
</del><ins>+ if {[lrange [split $lastline "\t"] 1 1] ne "Total"} {
</ins><span class="cx"> set lastline [lindex [split $result "\n"] end-2]
</span><span class="cx"> set errmsg [lindex [split $result "\n"] end]
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>