<!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>[137548] branches/gsoc15-dependency/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/137548">137548</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-06-14 01:09:38 -0700 (Sun, 14 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add if-else block in mportsearch to differntiate between
libsolv search and builtin search.
Previously it was running libsolv search as well as
builtin search on passing -l option.
Now run only libsolv search on -l option, else
use builtin search.
Pass more info to libsolv::search for further enhancements.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15dependencybasesrcmacports10macportstcl">branches/gsoc15-dependency/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl">branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15dependencybasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports.tcl (137547 => 137548)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports.tcl 2015-06-14 07:43:18 UTC (rev 137547)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports.tcl 2015-06-14 08:09:38 UTC (rev 137548)
</span><span class="lines">@@ -2739,109 +2739,114 @@
</span><span class="cx"> set matches [list]
</span><span class="cx"> set easy [expr {$field eq "name"}]
</span><span class="cx">
</span><ins>+ ## Use libsolv search if -l is passed
</ins><span class="cx"> if {[info exists macports::global_options(ports_depengine)]} {
</span><span class="cx"> if {$macports::global_options(ports_depengine) eq "libsolv"} {
</span><span class="cx"> macports::libsolv::create_pool
</span><span class="cx"> # macports::libsolv::print
</span><del>- set search_res [macports::libsolv::search $pattern]
</del><ins>+ set search_res [macports::libsolv::search $pattern \
+ $case_sensitive $matchstyle]
</ins><span class="cx"> }
</span><del>- }
- set found 0
- foreach source $sources {
- set source [lindex $source 0]
- set protocol [macports::getprotocol $source]
- if {[catch {set fd [open [macports::getindex $source] r]} result]} {
- ui_warn "Can't open index file for source: $source"
- } else {
- try {
- incr found 1
- while {[gets $fd line] >= 0} {
- array unset portinfo
- set name [lindex $line 0]
- set len [lindex $line 1]
- set line [read $fd $len]
</del><ins>+ } else {
+ ## Use builtin search algorithm.
+ set found 0
+ foreach source $sources {
+ set source [lindex $source 0]
+ set protocol [macports::getprotocol $source]
+ if {[catch {set fd [open [macports::getindex $source] r]} result]} {
+ ui_warn "Can't open index file for source: $source"
+ } else {
+ try {
+ incr found 1
+ while {[gets $fd line] >= 0} {
+ array unset portinfo
+ set name [lindex $line 0]
+ set len [lindex $line 1]
+ set line [read $fd $len]
</ins><span class="cx">
</span><del>- if {$easy} {
- set target $name
- } else {
- array set portinfo $line
- if {![info exists portinfo($field)]} {
- continue
</del><ins>+ if {$easy} {
+ set target $name
+ } else {
+ array set portinfo $line
+ if {![info exists portinfo($field)]} {
+ continue
+ }
+ set target $portinfo($field)
</ins><span class="cx"> }
</span><del>- set target $portinfo($field)
- }
</del><span class="cx">
</span><del>- switch -- $matchstyle {
- exact {
- if {$case_sensitive} {
- set compres [string compare $pattern $target]
- } else {
- set compres [string compare -nocase $pattern $target]
</del><ins>+ switch -- $matchstyle {
+ exact {
+ if {$case_sensitive} {
+ set compres [string compare $pattern $target]
+ } else {
+ set compres [string compare -nocase $pattern $target]
+ }
+ set matchres [expr {0 == $compres}]
</ins><span class="cx"> }
</span><del>- set matchres [expr {0 == $compres}]
- }
- glob {
- if {$case_sensitive} {
- set matchres [string match $pattern $target]
- } else {
- set matchres [string match -nocase $pattern $target]
</del><ins>+ glob {
+ if {$case_sensitive} {
+ set matchres [string match $pattern $target]
+ } else {
+ set matchres [string match -nocase $pattern $target]
+ }
</ins><span class="cx"> }
</span><del>- }
- regexp {
- if {$case_sensitive} {
- set matchres [regexp -- $pattern $target]
- } else {
- set matchres [regexp -nocase -- $pattern $target]
</del><ins>+ regexp {
+ if {$case_sensitive} {
+ set matchres [regexp -- $pattern $target]
+ } else {
+ set matchres [regexp -nocase -- $pattern $target]
+ }
</ins><span class="cx"> }
</span><ins>+ default {
+ return -code error "mportsearch: Unsupported matching style: ${matchstyle}."
+ }
</ins><span class="cx"> }
</span><del>- default {
- return -code error "mportsearch: Unsupported matching style: ${matchstyle}."
- }
- }
</del><span class="cx">
</span><del>- if {$matchres == 1} {
- if {$easy} {
- array set portinfo $line
- }
- switch -- $protocol {
- rsync {
- # Rsync files are local
- set source_url file://[macports::getsourcepath $source]
</del><ins>+ if {$matchres == 1} {
+ if {$easy} {
+ array set portinfo $line
</ins><span class="cx"> }
</span><del>- https -
- http -
- ftp {
- # daily snapshot tarball
- set source_url file://[macports::getsourcepath $source]
</del><ins>+ switch -- $protocol {
+ rsync {
+ # Rsync files are local
+ set source_url file://[macports::getsourcepath $source]
+ }
+ https -
+ http -
+ ftp {
+ # daily snapshot tarball
+ set source_url file://[macports::getsourcepath $source]
+ }
+ default {
+ set source_url $source
+ }
</ins><span class="cx"> }
</span><del>- default {
- set source_url $source
</del><ins>+ if {[info exists portinfo(portdir)]} {
+ set porturl ${source_url}/$portinfo(portdir)
+ lappend line porturl $porturl
+ ui_debug "Found port in $porturl"
+ } else {
+ ui_debug "Found port info: $line"
</ins><span class="cx"> }
</span><ins>+ lappend matches $name
+ lappend matches $line
</ins><span class="cx"> }
</span><del>- if {[info exists portinfo(portdir)]} {
- set porturl ${source_url}/$portinfo(portdir)
- lappend line porturl $porturl
- ui_debug "Found port in $porturl"
- } else {
- ui_debug "Found port info: $line"
- }
- lappend matches $name
- lappend matches $line
</del><span class="cx"> }
</span><ins>+ } catch * {
+ ui_warn "It looks like your PortIndex file for $source may be corrupt."
+ throw
+ } finally {
+ close $fd
</ins><span class="cx"> }
</span><del>- } catch * {
- ui_warn "It looks like your PortIndex file for $source may be corrupt."
- throw
- } finally {
- close $fd
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if {!$found} {
+ return -code error "No index(es) found! Have you synced your port definitions? Try running 'port selfupdate'."
+ }
+
+ return $matches
</ins><span class="cx"> }
</span><del>- if {!$found} {
- return -code error "No index(es) found! Have you synced your port definitions? Try running 'port selfupdate'."
- }
-
- return $matches
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ##
</span></span></pre></div>
<a id="branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl (137547 => 137548)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-06-14 07:43:18 UTC (rev 137547)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-06-14 08:09:38 UTC (rev 137548)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> # To Do list:
</span><span class="cx"> # Add support for search options i.e. --exact, --case-sensitive, --glob, --regex.
</span><span class="cx"> # Return portinfo to mportsearch which will pass the info to port.tcl to print results.
</span><del>- proc search {pattern} {
</del><ins>+ proc search {pattern {case_sensitive yes} {matchstyle regexp} } {
</ins><span class="cx"> variable pool
</span><span class="cx">
</span><span class="cx"> set sel [$pool Selection]
</span></span></pre>
</div>
</div>
</body>
</html>