<!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>[140540] trunk/base/src/macports1.0/macports.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/140540">140540</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-09-21 20:01:49 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix some cases where mportexec could return without cleaning up first</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (140539 => 140540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2015-09-22 02:13:12 UTC (rev 140539)
+++ trunk/base/src/macports1.0/macports.tcl 2015-09-22 03:01:49 UTC (rev 140540)
</span><span class="lines">@@ -2005,8 +2005,10 @@
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> set portname [_mportkey $mport subport]
</span><ins>+ set log_needs_pop no
</ins><span class="cx"> if {$target ne "clean"} {
</span><span class="cx"> macports::push_log $mport
</span><ins>+ set log_needs_pop yes
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Use _target_needs_deps as a proxy for whether we're going to
</span><span class="lines">@@ -2015,10 +2017,16 @@
</span><span class="cx"> if {[macports::_target_needs_deps $target]} {
</span><span class="cx"> # possibly warn or error out depending on how old xcode is
</span><span class="cx"> if {[$workername eval _check_xcode_version] != 0} {
</span><ins>+ if {$log_needs_pop} {
+ macports::pop_log
+ }
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> # error out if selected arch(s) not supported by this port
</span><span class="cx"> if {[$workername eval check_supported_archs] != 0} {
</span><ins>+ if {$log_needs_pop} {
+ macports::pop_log
+ }
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2043,6 +2051,9 @@
</span><span class="cx"> ui_msg {}
</span><span class="cx"> }
</span><span class="cx"> if {[mportdepends $mport $target] != 0} {
</span><ins>+ if {$log_needs_pop} {
+ macports::pop_log
+ }
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> if {![macports::ui_isset ports_debug]} {
</span><span class="lines">@@ -2067,6 +2078,12 @@
</span><span class="cx"> }
</span><span class="cx"> set retvalue [$macports::ui_options(questions_yesno) "The following dependencies will be installed: " "TestCase#2" [lsort $deplist] {y} 0]
</span><span class="cx"> if {$retvalue == 1} {
</span><ins>+ if {$log_needs_pop} {
+ macports::pop_log
+ }
+ foreach ditem $dlist {
+ mportclose $ditem
+ }
</ins><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -2077,7 +2094,7 @@
</span><span class="cx"> ui_msg $depstring
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> # install them
</span><span class="cx"> set result [dlist_eval $dlist _mportactive [list _mportexec activate]]
</span><span class="cx">
</span><span class="lines">@@ -2097,6 +2114,9 @@
</span><span class="cx"> foreach ditem $dlist {
</span><span class="cx"> catch {mportclose $ditem}
</span><span class="cx"> }
</span><ins>+ if {$log_needs_pop} {
+ macports::pop_log
+ }
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2107,7 +2127,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> # No dependencies, but we still need to check for conflicts.
</span><span class="cx"> if {$target eq "" || $target eq "install" || $target eq "activate"} {
</span><del>- _mporterrorifconflictsinstalled $mport
</del><ins>+ if {[catch {_mporterrorifconflictsinstalled $mport}]} {
+ if {$log_needs_pop} {
+ macports::pop_log
+ }
+ return 1
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2129,10 +2154,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> global ::logenabled ::debuglogname
</span><del>- if {[info exists ::logenabled] && $::logenabled && [info exists ::debuglogname]} {
- if {$result != 0} {
- ui_error "See $::debuglogname for details."
- }
</del><ins>+ if {$result != 0 && [info exists ::logenabled] && $::logenabled && [info exists ::debuglogname]} {
+ ui_error "See $::debuglogname for details."
+ }
+
+ if {$log_needs_pop} {
</ins><span class="cx"> macports::pop_log
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3133,7 +3159,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {$target in {{} install activate}} {
</span><del>- _mporterrorifconflictsinstalled $mport
</del><ins>+ if {[catch {_mporterrorifconflictsinstalled $mport}]} {
+ return 1
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set workername [ditem_key $mport workername]
</span><span class="lines">@@ -3268,7 +3296,7 @@
</span><span class="cx"> }
</span><span class="cx"> if {$arch_mismatch} {
</span><span class="cx"> macports::_explain_arch_mismatch [_mportkey $mport subport] $dep_portname $required_archs $supported_archs $has_universal
</span><del>- return -code error "architecture mismatch"
</del><ins>+ return 1
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>