<!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>[138807] 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/138807">138807</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-07-20 11:25:44 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add installed port information to the $pool repo
$repo_installed by reading registry::installed.</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 (138806 => 138807)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports.tcl 2015-07-20 11:43:41 UTC (rev 138806)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports.tcl 2015-07-20 18:25:44 UTC (rev 138807)
</span><span class="lines">@@ -2753,6 +2753,7 @@
</span><span class="cx"> # macports::libsolv::print
</span><span class="cx"> set search_res [macports::libsolv::search $pattern \
</span><span class="cx"> $case_sensitive $matchstyle $field]
</span><ins>+ # macports::libsolv::create_installed_pool
</ins><span class="cx"> return $search_res
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl (138806 => 138807)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-07-20 11:43:41 UTC (rev 138806)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-07-20 18:25:44 UTC (rev 138807)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> ## Variable for portindexinfo
</span><span class="cx"> variable portindexinfo
</span><span class="cx">
</span><ins>+ ## Variable to track registry changes.
+ variable regupdate
+
</ins><span class="cx"> ## Some debugging related printing of variable contents
</span><span class="cx"> proc print {} {
</span><span class="cx"> set pool [create_pool]
</span><span class="lines">@@ -83,7 +86,22 @@
</span><span class="cx">
</span><span class="cx"> ## Create a new pool instance by calling Pool contructor.
</span><span class="cx"> set pool [solv::Pool]
</span><ins>+ ## Repo for installed ports
+ set repo_installed [$pool add_repo "installed"]
</ins><span class="cx">
</span><ins>+ ## Create a list of installed ports by reading registry::installed.
+ array set installed_ports [list]
+ try {
+ foreach installed [registry::installed] {
+ lassign $installed name version revision variants active epoch
+ if {$active != 0} {
+ set installed_ports($name,$epoch,$version,$revision) $installed
+ }
+ }
+ } catch * {
+ ui_warn "No installed ports found in registry"
+ }
+
</ins><span class="cx"> foreach source $sources {
</span><span class="cx"> set source [lindex $source 0]
</span><span class="cx"> ## Add a repo in the pool for each source as mentioned in sources.conf
</span><span class="lines">@@ -95,9 +113,6 @@
</span><span class="cx"> } else {
</span><span class="cx"> try {
</span><span class="cx"> while {[gets $fd line] >= 0} {
</span><del>- # Create a solvable for each port processed.
- set solvable [$repo add_solvable]
-
</del><span class="cx"> ## Clear the portinfo contents to prevent attribute leak \
</span><span class="cx"> # from previous iterations
</span><span class="cx"> array unset portinfo
</span><span class="lines">@@ -107,6 +122,15 @@
</span><span class="cx">
</span><span class="cx"> array set portinfo $line
</span><span class="cx">
</span><ins>+ # Create a solvable for each port processed.
+ # If the port is already installed add it to $repo_installed. Also add it to $repo
+ if {[info exists installed_ports($name,$portinfo(epoch),$portinfo(version),$portinfo(revision))]} {
+ set solvable [$repo_installed add_solvable]
+ } else {
+ set solvable [$repo add_solvable]
+ }
+ # set solvable [$repo add_solvable]
+
</ins><span class="cx"> $solvable configure -name $name \
</span><span class="cx"> -evr "$portinfo(epoch)@$portinfo(version)-$portinfo(revision)" \
</span><span class="cx"> -arch "i386"
</span><span class="lines">@@ -158,6 +182,7 @@
</span><span class="cx"> # is available for lookup and dataiterator functions. Do this after\
</span><span class="cx"> # all the solvables are added to repo as it is a costly operation.
</span><span class="cx"> $repodata internalize
</span><ins>+ $pool configure -installed $repo_installed
</ins><span class="cx"> close $fd
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -165,8 +190,9 @@
</span><span class="cx"> ## createwhatprovides creates hash over all the provides of the package \
</span><span class="cx"> # This method is necessary before we can run any lookups on provides.
</span><span class="cx"> $pool createwhatprovides
</span><ins>+
+ return $pool
</ins><span class="cx"> }
</span><del>- return $pool
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## Search using libsolv. Needs some more work.
</span></span></pre>
</div>
</div>
</body>
</html>