<!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>[112421] branches/release_2_2</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/112421">112421</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2013-10-22 06:37:57 -0700 (Tue, 22 Oct 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>merge <a href="https://trac.macports.org/changeset/112067">r112067</a> from trunk:
 in mportdepends, skip mport refs that have been closed by a recursive call (#40721)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_2_2basesrcmacports10macportstcl">branches/release_2_2/base/src/macports1.0/macports.tcl</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branchesrelease_2_2">branches/release_2_2/</a></li>
<li><a href="#branchesrelease_2_2base">branches/release_2_2/base/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesrelease_2_2"></a>
<div class="propset"><h4>Property changes: branches/release_2_2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">   + /trunk:107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641,112067
</span><a id="branchesrelease_2_2base"></a>
<div class="propset"><h4>Property changes: branches/release_2_2/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><span class="cx">   + /branches/gsoc08-privileges/base:37343-46937
</span><span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869,110985,111254,111377,111641,112067
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><a id="branchesrelease_2_2basesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/release_2_2/base/src/macports1.0/macports.tcl (112420 => 112421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_2/base/src/macports1.0/macports.tcl        2013-10-22 13:32:52 UTC (rev 112420)
+++ branches/release_2_2/base/src/macports1.0/macports.tcl        2013-10-22 13:37:57 UTC (rev 112421)
</span><span class="lines">@@ -3043,11 +3043,15 @@
</span><span class="cx"> 
</span><span class="cx">     # Loop on the depports.
</span><span class="cx">     if {$recurseDeps} {
</span><ins>+        # Dep ports should be installed (all dependencies must be satisfied).
</ins><span class="cx">         foreach depport $depPorts {
</span><del>-            # Sub ports should be installed (all dependencies must be satisfied).
-            set res [mportdepends $depport &quot;&quot; $recurseDeps $skipSatisfied 1]
-            if {$res != 0} {
-                return $res
</del><ins>+            # Any of these may have been closed by a previous recursive call
+            # and replaced by a universal version. This is fine, just skip.
+            if {[ditem_key $depport] ne {}} {
+                set res [mportdepends $depport {} $recurseDeps $skipSatisfied 1]
+                if {$res != 0} {
+                    return $res
+                }
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>