<!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>[138948] 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/138948">138948</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2015-07-24 14:46:53 -0700 (Fri, 24 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>macports1.0: Don't add a special "debuglog" string to channels, we want to log everything anyway</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 (138947 => 138948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl        2015-07-24 21:31:09 UTC (rev 138947)
+++ trunk/base/src/macports1.0/macports.tcl        2015-07-24 21:46:53 UTC (rev 138948)
</span><span class="lines">@@ -138,10 +138,6 @@
</span><span class="cx"> ui_debug "Logging disabled, error opening log file: $err"
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><del>- # Add our log-channel to all already initialized channels
- foreach key [array names channels] {
- set macports::channels($key) [concat $macports::channels($key) debuglog]
- }
</del><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx"> proc macports::ch_logging {mport} {
</span><span class="lines">@@ -234,27 +230,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach chan $macports::channels($priority) {
</span><del>- if {[info exists ::debuglog] && ($chan eq "debuglog")} {
- set chan $::debuglog
- if {[info exists macports::current_phase]} {
- set phase $macports::current_phase
- }
- set strprefix ":${priority}:$phase "
- if {[lindex $args 0] eq "-nonewline"} {
- puts -nonewline $chan $strprefix[lindex $args 1]
- } else {
- puts $chan $strprefix[lindex $args 0]
- }
</del><ins>+ if {[lindex $args 0] eq "-nonewline"} {
+ puts -nonewline $chan $prefix[lindex $args 1]
+ } else {
+ puts $chan $prefix[lindex $args 0]
+ }
+ }
</ins><span class="cx">
</span><ins>+ if {[info exists ::debuglog]} {
+ set chan $::debuglog
+ if {[info exists macports::current_phase]} {
+ set phase $macports::current_phase
+ }
+ set strprefix ":${priority}:$phase "
+ if {[lindex $args 0] eq "-nonewline"} {
+ puts -nonewline $chan $strprefix[lindex $args 1]
</ins><span class="cx"> } else {
</span><del>- if {[lindex $args 0] eq "-nonewline"} {
- puts -nonewline $chan $prefix[lindex $args 1]
- } else {
- puts $chan $prefix[lindex $args 0]
- }
</del><ins>+ puts $chan $strprefix[lindex $args 0]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> proc macports::ui_init {priority args} {
</span><span class="cx"> global macports::channels ::debuglog
</span><span class="cx"> set default_channel [macports::ui_channels_default $priority]
</span><span class="lines">@@ -265,10 +261,6 @@
</span><span class="cx"> set channels($priority) $default_channel
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # if some priority initialized after log file is being created
- if {[info exists ::debuglog]} {
- set channels($priority) [concat $channels($priority) debuglog]
- }
</del><span class="cx"> # Simplify ui_$priority.
</span><span class="cx"> try {
</span><span class="cx"> set prefix [ui_prefix $priority]
</span></span></pre>
</div>
</div>
</body>
</html>