<!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>[134986] trunk/base/src/port/port.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/134986">134986</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-04-12 14:31:40 -0700 (Sun, 12 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: port.tcl: Don't show portundocumented(7) for non-existant actions, support port help $topic for topics from section 5 and 7</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (134985 => 134986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2015-04-12 21:13:14 UTC (rev 134985)
+++ trunk/base/src/port/port.tcl 2015-04-12 21:31:40 UTC (rev 134986)
</span><span class="lines">@@ -1829,7 +1829,7 @@
</span><span class="cx"> # Look for an action with the requested argument
</span><span class="cx"> set actions [find_action $topic]
</span><span class="cx"> if {[llength $actions] == 1} {
</span><del>- set page "man1/port-[lindex $actions 0].1$manext"
</del><ins>+ set page "man1/port-[lindex $actions 0].1${manext}"
</ins><span class="cx"> } else {
</span><span class="cx"> if {[llength $actions] > 1} {
</span><span class="cx"> ui_error "\"port help ${action}\" is ambiguous: \n port help [join $actions "\n port help "]"
</span><span class="lines">@@ -1838,11 +1838,26 @@
</span><span class="cx">
</span><span class="cx"> # No valid command specified
</span><span class="cx"> set page ""
</span><ins>+ # Try to find the manpage in sections 5 (configuration) and 7
+ foreach section {5 7} {
+ set page_candidate "man${section}/${topic}.${section}${manext}"
+ set pagepath ${macports::prefix}/share/man/${page_candidate}
+ ui_debug "testing $pagepath..."
+ if {[file exists $pagepath]} {
+ set page $page_candidate
+ break
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- set pagepath ${macports::prefix}/share/man/$page
- if {$page == "" || ![file exists $pagepath]} {
</del><ins>+ set pagepath ""
+ if {$page ne ""} {
+ set pagepath ${macports::prefix}/share/man/$page
+ }
+ if {$page ne "" && ![file exists $pagepath]} {
+ # command exists, but there doesn't seem to be a manpage for it; open
+ # portundocumented.7
</ins><span class="cx"> set page "man7/portundocumented.7$manext"
</span><span class="cx"> set pagepath ${macports::prefix}/share/man/$page
</span><span class="cx"> }
</span><span class="lines">@@ -1860,7 +1875,7 @@
</span><span class="cx"> }
</span><span class="cx"> array set env [array get boot_env]
</span><span class="cx">
</span><del>- if [catch {system -nodup "${macports::autoconf::man_path} $pagepath"} result] {
</del><ins>+ if [catch {system -nodup [list ${macports::autoconf::man_path} $pagepath]} result] {
</ins><span class="cx"> ui_debug "$::errorInfo"
</span><span class="cx"> ui_error "Unable to show man page using ${macports::autoconf::man_path}: $result"
</span><span class="cx"> return 1
</span></span></pre>
</div>
</div>
</body>
</html>