<!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>[60770] branches/release_1_8/base/src</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="http://trac.macports.org/changeset/60770">60770</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2009-11-22 20:32:54 -0800 (Sun, 22 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>1.8 branch: similar change to trunk's <a href="http://trac.macports.org/changeset/60769">r60769</a>:
 * include command output in the return value of the system proc only if not in debug or verbose mode (#21084)
 * instruct user to run again in debug mode on failure, or give the ticket guidelines URL if in debug mode already</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_1_8basesrcpextlib10systemc">branches/release_1_8/base/src/pextlib1.0/system.c</a></li>
<li><a href="#branchesrelease_1_8basesrcportporttcl">branches/release_1_8/base/src/port/port.tcl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesrelease_1_8basesrcpextlib10systemc"></a>
<div class="modfile"><h4>Modified: branches/release_1_8/base/src/pextlib1.0/system.c (60769 => 60770)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_1_8/base/src/pextlib1.0/system.c        2009-11-23 03:23:47 UTC (rev 60769)
+++ branches/release_1_8/base/src/pextlib1.0/system.c        2009-11-23 04:32:54 UTC (rev 60770)
</span><span class="lines">@@ -196,21 +196,9 @@
</span><span class="cx">                 if (WEXITSTATUS(ret) == 0) {
</span><span class="cx">                         status = TCL_OK;
</span><span class="cx">                 } else {
</span><del>-                        /* Copy the contents of the circular buffer to errbuf */
-                          Tcl_Obj* errorCode;
-                        errbuf = Tcl_NewStringObj(NULL, 0);
-                        for (fline = pos; pos &lt; fline + CBUFSIZ; pos++) {
-                                if (circbuf[pos % CBUFSIZ].len == 0)
-                                continue; /* skip empty lines */
</del><ins>+                    Tcl_Obj* errorCode;
+                    const char *portverbose;
</ins><span class="cx"> 
</span><del>-                                /* Append line, minus trailing NULL */
-                                Tcl_AppendToObj(errbuf, circbuf[pos % CBUFSIZ].line,
-                                                circbuf[pos % CBUFSIZ].len - 1);
-
-                                /* Re-add previously stripped newline */
-                                Tcl_AppendToObj(errbuf, &quot;\n&quot;, 1);
-                        }
-
</del><span class="cx">                         /* set errorCode [list CHILDSTATUS &lt;pid&gt; &lt;code&gt;] */
</span><span class="cx">                         errorCode = Tcl_NewListObj(0, NULL);
</span><span class="cx">                         Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj(&quot;CHILDSTATUS&quot;, -1));
</span><span class="lines">@@ -223,8 +211,27 @@
</span><span class="cx">                         Tcl_AppendToObj(tcl_result, cmdstring, -1);
</span><span class="cx">                         Tcl_AppendToObj(tcl_result, &quot;\&quot; returned error &quot;, -1);
</span><span class="cx">                         Tcl_AppendObjToObj(tcl_result, Tcl_NewIntObj(WEXITSTATUS(ret)));
</span><del>-                        Tcl_AppendToObj(tcl_result, &quot;\nCommand output: &quot;, -1);
-                        Tcl_AppendObjToObj(tcl_result, errbuf);
</del><ins>+                        
+                        portverbose = Tcl_GetVar(interp, &quot;portverbose&quot;, TCL_GLOBAL_ONLY);
+                        /* include last 30 lines of output only if they haven't already
+                           been shown due to debug or verbose mode */
+                        if (portverbose &amp;&amp; strcmp(&quot;yes&quot;, portverbose) != 0) {
+                            /* Copy the contents of the circular buffer to errbuf */
+                errbuf = Tcl_NewStringObj(NULL, 0);
+                for (fline = pos; pos &lt; fline + CBUFSIZ; pos++) {
+                    if (circbuf[pos % CBUFSIZ].len == 0)
+                    continue; /* skip empty lines */
+
+                    /* Append line, minus trailing NULL */
+                    Tcl_AppendToObj(errbuf, circbuf[pos % CBUFSIZ].line,
+                            circbuf[pos % CBUFSIZ].len - 1);
+
+                    /* Re-add previously stripped newline */
+                    Tcl_AppendToObj(errbuf, &quot;\n&quot;, 1);
+                }
+                            Tcl_AppendToObj(tcl_result, &quot;\nCommand output: &quot;, -1);
+                            Tcl_AppendObjToObj(tcl_result, errbuf);
+                        }
</ins><span class="cx">                         Tcl_SetObjResult(interp, tcl_result);
</span><span class="cx">                 }
</span><span class="cx">         }
</span></span></pre></div>
<a id="branchesrelease_1_8basesrcportporttcl"></a>
<div class="modfile"><h4>Modified: branches/release_1_8/base/src/port/port.tcl (60769 => 60770)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_1_8/base/src/port/port.tcl        2009-11-23 03:23:47 UTC (rev 60769)
+++ branches/release_1_8/base/src/port/port.tcl        2009-11-23 04:32:54 UTC (rev 60770)
</span><span class="lines">@@ -156,6 +156,16 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+# show the URL for the ticket reporting instructions
+proc print_tickets_url {args} {
+    if {![macports::ui_isset ports_quiet]} {
+        if {[macports::ui_isset ports_debug]} {
+            ui_msg &quot;To report a bug, see &lt;http://guide.macports.org/#project.tickets&gt;&quot;
+        } else {
+            ui_msg &quot;Before reporting a bug, first run the command again with the -d flag to get complete output.&quot;
+        }
+    }
+}
</ins><span class="cx"> 
</span><span class="cx"> # Form a composite version as is sometimes used for registry functions
</span><span class="cx"> proc composite_version {version variations {emptyVersionOkay 0}} {
</span><span class="lines">@@ -2037,7 +2047,7 @@
</span><span class="cx">                 if {!$orig_nodeps} {
</span><span class="cx">                     unset -nocomplain macports::global_options(ports_nodeps)
</span><span class="cx">                 }
</span><del>-                return $status
</del><ins>+                break
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -2045,6 +2055,9 @@
</span><span class="cx">     if {!$orig_nodeps} {
</span><span class="cx">         unset -nocomplain macports::global_options(ports_nodeps)
</span><span class="cx">     }
</span><ins>+    if {$status != 0} {
+        print_tickets_url
+    }
</ins><span class="cx">     return $status
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2932,6 +2945,9 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     
</span><ins>+    if {$status != 0} {
+        print_tickets_url
+    }
</ins><span class="cx">     return $status
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>