<!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>[140932] 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/140932">140932</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-10-05 14:18:02 -0700 (Mon, 05 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use '$trans order' to topologically sort portlist.
Use '$trans order' to topologically sort the list of
ports to be installed in macports_libsolv.tcl. This will
save extra computation previously done as a workaround
in macports.tcl. Replace if-elseif-else block with switch
block. Set the $repo name correctly by checking the protocol
of the $source.</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 (140931 => 140932)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports.tcl        2015-10-05 21:12:29 UTC (rev 140931)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports.tcl        2015-10-05 21:18:02 UTC (rev 140932)
</span><span class="lines">@@ -2002,27 +2002,12 @@
</span><span class="cx"> ## Install each port. First use mportopen and then _mportexec.
</span><span class="cx"> if {[info exists dep_res]} {
</span><span class="cx"> set dlist [list]
</span><del>- set portlist [list]
</del><span class="cx"> foreach port $dep_res {
</span><span class="cx"> set portsolv [lindex $port 0]
</span><del>- lappend portlist [$portsolv cget -name]
- }
- ui_debug "Printing portlist"
- ui_debug $portlist
- foreach port $dep_res {
- set portsolv [lindex $port 0]
</del><span class="cx"> set portname [$portsolv cget -name]
</span><span class="cx"> set porturl [lindex $port 1]
</span><span class="cx"> set options(subport) $portname
</span><del>-
</del><span class="cx"> set mport [mportopen $porturl [list subport $portname]]
</span><del>- foreach dep [$portsolv lookup_deparray $solv::SOLVABLE_REQUIRES] {
- set depname [$dep __str__]
- if {$depname ni $portlist} {
- continue
- }
- ditem_append_unique $mport requires $depname
- }
</del><span class="cx"> lappend dlist $mport
</span><span class="cx"> }
</span><span class="cx"> set result [dlist_eval $dlist _mportactive [list _mportexec activate]]
</span></span></pre></div>
<a id="branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl (140931 => 140932)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl        2015-10-05 21:12:29 UTC (rev 140931)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl        2015-10-05 21:18:02 UTC (rev 140932)
</span><span class="lines">@@ -114,9 +114,13 @@
</span><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><del>- set repo [$pool add_repo [macports::getsourcepath $source]]
</del><ins>+ if {[macports::getprotocol $source] eq "file"} {
+ set repo [$pool add_repo [macports::getportdir $source]]
+ } else {
+ set repo [$pool add_repo [macports::getsourcepath $source]]
+ }
</ins><span class="cx"> set repodata [$repo add_repodata]
</span><del>-
</del><ins>+
</ins><span class="cx"> if {[catch {set fd [open [macports::getindex $source] r]} result]} {
</span><span class="cx"> ui_warn "Can't open index file for source: $source"
</span><span class="cx"> } else {
</span><span class="lines">@@ -419,38 +423,42 @@
</span><span class="cx"> set install_list [list]
</span><span class="cx"> set dep_list [list]
</span><span class="cx"> foreach cl [$trans classify $clflag] {
</span><del>- if {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_ERASE} {
- puts "[$cl cget -count] Erased packages:"
- } elseif {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_INSTALL} {
- puts "[$cl cget -count] Installed packages:"
- } elseif {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_REINSTALLED} {
- puts "[$cl cget -count] Reinstalled packages:"
- } elseif {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_DOWNGRADED} {
- puts "[$cl cget -count] Downgraded packages:"
- } elseif {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_CHANGED} {
- puts "[$cl cget -count] Changed packages:"
- } elseif {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_UPGRADED} {
- puts "[$cl cget -count] Upgraded packages:"
- } elseif {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_VENDORCHANGE} {
- puts "[$cl cget -count] Vendor changes from [$cl cget -fromstr] to [$cl cget -tostr]"
- } elseif {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_ARCHCHANGE} {
- puts "[$cl cget -count] Arch changes from [$cl cget -fromstr] to [$cl cget -tostr]"
- } else {
- continue
- }
</del><ins>+ switch -- [$cl cget -type] \
+ $solv::Transaction_SOLVER_TRANSACTION_ERASE {
+ puts "[$cl cget -count] Erased packages:"
+ } \
+ $solv::Transaction_SOLVER_TRANSACTION_INSTALL {
+ puts "[$cl cget -count] Installed packages:"
+ } \
+ $solv::Transaction_SOLVER_TRANSACTION_REINSTALLED {
+ puts "[$cl cget -count] Reinstalled packages:"
+ } \
+ $solv::Transaction_SOLVER_TRANSACTION_DOWNGRADED {
+ puts "[$cl cget -count] Downgraded packages:"
+ } \
+ $solv::Transaction_SOLVER_TRANSACTION_CHANGED {
+ puts "[$cl cget -count] Changed packages:"
+ } \
+ $solv::Transaction_SOLVER_TRANSACTION_UPGRADED {
+ puts "[$cl cget -count] Upgraded packages:"
+ } \
+ $solv::Transaction_SOLVER_TRANSACTION_VENDORCHANGE {
+ puts "[$cl cget -count] Vendor changes from [$cl cget -fromstr] to [$cl cget -tostr]"
+ } \
+ $solv::Transaction_SOLVER_TRANSACTION_ARCHCHANGE {
+ puts "[$cl cget -count] Arch changes from [$cl cget -fromstr] to [$cl cget -tostr]"
+ } \
+ default continue
+
</ins><span class="cx"> foreach p [$cl solvables] {
</span><ins>+ set cltype [$cl cget -type]
</ins><span class="cx"> set upflag $solv::Transaction_SOLVER_TRANSACTION_UPGRADED
</span><span class="cx"> set downflag $solv::Transaction_SOLVER_TRANSACTION_DOWNGRADED
</span><del>- if {[$cl cget -type] == $upflag || [$cl cget -type] == $downflag} {
</del><ins>+ if {$cltype == $upflag || $cltype == $downflag} {
</ins><span class="cx"> set op [$trans othersolvable $p]
</span><span class="cx"> puts "[$p __str__] -> [$op __str__]"
</span><span class="cx"> } else {
</span><del>- puts [$p __str__]
</del><span class="cx"> lappend dep_list [$p __str__]
</span><del>- array set portinfo $portindexinfo([$p cget -id])
- set porturl "file://[[$p cget -repo] cget -name]/${portinfo(portdir)}"
- lappend install_list [list $p $porturl]
- array unset -nocomplain portinfo
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -462,6 +470,16 @@
</span><span class="cx"> } else {
</span><span class="cx"> set depstring "$macports::ui_prefix Dependencies to be installed by libsolv:"
</span><span class="cx"> }
</span><ins>+
+ # Commiting Transaction.
+ $trans order
+ ui_msg "Comitting Transaction:"
+ foreach p [$trans steps] {
+ array set portinfo $portindexinfo([$p cget -id])
+ set porturl "file://[[$p cget -repo] cget -name]/${portinfo(portdir)}"
+ lappend install_list [list $p $porturl]
+ array unset -nocomplain portinfo
+ }
</ins><span class="cx"> return $install_list
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>