<!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>[138666] branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl</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/138666">138666</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-07-15 07:17:30 -0700 (Wed, 15 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix configuring dependency and conflict info of solv.
Extract name field from $portspec and append to $portname list.
Use (name) instead of (fullname) as fullname returns a '/' at the
end of portname. Remove $marker values from lappend $fields as
we are not sure about how they actually work.
There can be a list of portnames in $portinfo(field), hence
treat it as a list and run a loop on it to extract the dependency
portnames.</pre>
<h3>Modified Paths</h3>
<ul>
<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="branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl (138665 => 138666)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-07-15 13:51:43 UTC (rev 138665)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-07-15 14:17:30 UTC (rev 138666)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> ## Some debugging related printing of variable contents
</span><span class="cx"> proc print {} {
</span><del>- variable pool
</del><ins>+ set pool [create_pool]
</ins><span class="cx"> puts $solv::Job_SOLVER_SOLVABLE
</span><span class="cx"> puts $pool
</span><span class="cx">
</span><span class="lines">@@ -69,11 +69,11 @@
</span><span class="cx">
</span><span class="cx"> ## set fields for adding dependency information to the solv's by looping over $fields.
</span><span class="cx"> set fields [list]
</span><del>- lappend fields "depends_fetch" $solv::SOLVABLE_REQUIRES [list 1]
- lappend fields "depends_extract" $solv::SOLVABLE_REQUIRES [list 1]
- lappend fields "depends_build" $solv::SOLVABLE_REQUIRES [list 1]
- lappend fields "depends_lib" $solv::SOLVABLE_REQUIRES [list -1]
- lappend fields "depends_run" $solv::SOLVABLE_REQUIRES [list -1]
</del><ins>+ lappend fields "depends_fetch" $solv::SOLVABLE_REQUIRES [list]
+ lappend fields "depends_extract" $solv::SOLVABLE_REQUIRES [list]
+ lappend fields "depends_build" $solv::SOLVABLE_REQUIRES [list]
+ lappend fields "depends_lib" $solv::SOLVABLE_REQUIRES [list]
+ lappend fields "depends_run" $solv::SOLVABLE_REQUIRES [list]
</ins><span class="cx"> lappend fields "conflicts" $solv::SOLVABLE_CONFLICTS [list]
</span><span class="cx"> lappend fields "replaced_by" $solv::SOLVABLE_OBSOLETES [list]
</span><span class="cx">
</span><span class="lines">@@ -136,8 +136,10 @@
</span><span class="cx"> # and -1 for runtime dependencies
</span><span class="cx"> foreach {fieldname deptype marker} $fields {
</span><span class="cx"> if {[info exists portinfo($fieldname)]} {
</span><del>- set dep_name [lindex [split $portinfo($fieldname) :] end]
- $solvable add_deparray $deptype [$pool str2id $dep_name 1] {*}$marker
</del><ins>+ foreach dep $portinfo($fieldname) {
+ set dep_name [lindex [split $dep :] end]
+ $solvable add_deparray $deptype [$pool str2id $dep_name 1] {*}$marker
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -251,8 +253,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## Dependency calculation using libsolv
</span><del>- proc dep_calc {portname} {
</del><ins>+ proc dep_calc {portlist} {
</ins><span class="cx"> set pool [create_pool]
</span><ins>+ # $pool set_debuglevel 3
+
+ ## List of ports to be installed
+ set portname [list]
+ ## Append portname to $portname after extracting them from $portlist
+ foreach portspec $portlist {
+ array set portinfo $portspec
+ set pname $portinfo(name)
+ lappend portname $pname
+ array unset -nocomplain portinfo
+ }
+
</ins><span class="cx"> ui_msg "$macports::ui_prefix Computing dependencies for $portname using libsolv"
</span><span class="cx"> set jobs [list]
</span><span class="cx"> foreach arg $portname {
</span><span class="lines">@@ -330,6 +344,8 @@
</span><span class="cx"> set clflag [expr $solv::Transaction_SOLVER_TRANSACTION_SHOW_OBSOLETES \
</span><span class="cx"> | $solv::Transaction_SOLVER_TRANSACTION_OBSOLETE_IS_UPGRADE]
</span><span class="cx">
</span><ins>+ set install_list [list]
+
</ins><span class="cx"> foreach cl [$trans classify $clflag] {
</span><span class="cx"> if {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_ERASE} {
</span><span class="cx"> puts "[$cl cget -count] Erased packages:"
</span><span class="lines">@@ -358,8 +374,10 @@
</span><span class="cx"> puts "[$p __str__] -> [$op __str__]"
</span><span class="cx"> } else {
</span><span class="cx"> puts [$p __str__]
</span><ins>+ lappend install_list [$p cget -name]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ return $install_list
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>