<!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>[138413] 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/138413">138413</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-07-07 10:22:30 -0700 (Tue, 07 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Set SOLVABLE_PROVIDES to the solv's.
Create jobs for the solv to be installed.
Find solutions for the problemis arising after running
solve_helper on jobs_list. Add ui_option for the user
to select an appropriate solution and continue with new
set of jobs.</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 (138412 => 138413)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl        2015-07-07 16:58:33 UTC (rev 138412)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl        2015-07-07 17:22:30 UTC (rev 138413)
</span><span class="lines">@@ -141,6 +141,9 @@
</span><span class="cx">                                 }
</span><span class="cx">                             }
</span><span class="cx"> 
</span><ins>+                            ## Set SOLVABLE_PROVIDES for the solv so that the package can be found during depcalc.
+                            $solvable add_deparray $solv::SOLVABLE_PROVIDES [$pool str2id $name 0]
+                            
</ins><span class="cx">                             ## Set portinfo of each solv object. Map it to correct solvid.
</span><span class="cx">                             set portindexinfo([$solvable cget -id]) $line
</span><span class="cx">                         }
</span><span class="lines">@@ -255,16 +258,68 @@
</span><span class="cx">         foreach arg $portname {
</span><span class="cx">             set portid [$pool str2id $portname]
</span><span class="cx">             set flags [expr $solv::Selection_SELECTION_NAME | $solv::Selection_SELECTION_PROVIDES \
</span><del>-            | $solv::Selection_SELECTION_CANON | $solv::Selection_SELECTION_DOTARCH \
-            | $solv::Selection_SELECTION_REL]
</del><ins>+                | $solv::Selection_SELECTION_CANON | $solv::Selection_SELECTION_DOTARCH \
+                | $solv::Selection_SELECTION_REL]
</ins><span class="cx">             set sel [$pool select $arg $flags]
</span><ins>+            
+            ## If selection is empty, try with NOCASE.
</ins><span class="cx">             if {[$sel isempty]} {
</span><span class="cx">                 set sel [$pool select $arg [expr $flags | $solv::Selection_SELECTION_NOCASE]]
</span><span class="cx">             }
</span><ins>+
+            ## Append the list of jobs from selection to $jobs. Use {*} so that whole list can be appended.
</ins><span class="cx">             lappend jobs {*}[$sel jobs $solv::Job_SOLVER_INSTALL]
</span><span class="cx">         }
</span><del>-        foreach job $jobs { 
-            $job configure -how $solv::Job_SOLVER_INSTALL
</del><ins>+
+        ## Solve the jobs
+        set solver [$pool Solver]
+        while {yes} {
+            set jobs_list [list]
+            foreach job $jobs { 
+                puts &quot;Jobs = [$job __str__]&quot;
+                lappend jobs_list [$job cget -how] [$job cget -what]
+            }
+
+            set problems [$solver solve_helper $jobs_list]
+
+            ## If no problems found, break, else find a solution.
+            if {[llength $problems] == 0} {
+                break
+            }
+
+            ## Find a solution for the problems found.
+            foreach problem $problems {
+                ui_debug &quot;Problem [$problem cget -id]/[llength $problems]&quot;
+                ui_debug &quot;prob = [$problem __str__]&quot;
+                set solutions [$problem solutions]
+                set solutions_str [list]
+                foreach solution $solutions {
+                    set solution_str &quot;Solution [$solution cget -id]&quot;
+                    set elements [$solution elements yes]
+                    foreach element $elements {
+                        append solution_str &quot;\n     - [$element str]&quot;
+                    }
+                    lappend solution_strs $solution_str
+                }
+                
+                if {![info exists macports::ui_options(questions_singlechoice)]} {
+                    error &quot;A conflict occurred&quot;
+                }
+                set ret [$macports::ui_options(questions_singlechoice) \
+                    &quot;[$problem __str__]: Please choose a solution:&quot; &quot;solver&quot; $solution_strs]
+                set idx [expr {$ret - 1}]
+                set solution [lindex $solutions $idx]
+                foreach element [$solution elements] {
+                    set newjob [$element Job]
+                    if {[$element cget -type] == $solv::Solver_SOLVER_SOLUTION_JOB} {
+                        lset jobs [$element cget -jobidx] $newjob
+                    } elseif {$newjob ne &quot;NULL&quot; &amp;&amp; $newjob ni $jobs} {
+                        lappend jobs $newjob
+                    }
+                }
+            }
</ins><span class="cx">         }
</span><ins>+
+        ## Transaction Part
</ins><span class="cx">     }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>