<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[29669] trunk/base/src/macports1.0/macports.tcl</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/29669">29669</a></dd>
<dt>Author</dt> <dd>jmpp@macports.org</dd>
<dt>Date</dt> <dd>2007-10-04 09:33:25 -0700 (Thu, 04 Oct 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Unbreak reading the user specific macports.conf file by evaluating the macports_user_dir variable, not erroneously passing the 'macports_user_dir' string to the tcl file(n) command.
This has been broken for ages and only one person reported it in #12250 but no one else complained, so I guess not many use this feature. Thanks to 'joachim.kuebart@gmx.net' for noticing and for the patch.
Closes #12250</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 (29668 => 29669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2007-10-04 16:06:38 UTC (rev 29668)
+++ trunk/base/src/macports1.0/macports.tcl 2007-10-04 16:33:25 UTC (rev 29669)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> set PORTSRC $env(PORTSRC)
</span><span class="cx"> lappend conf_files ${PORTSRC}
</span><span class="cx"> }
</span><del>- if { [file isdirectory macports_user_dir] } {
</del><ins>+ if { [file isdirectory $macports_user_dir] } {
</ins><span class="cx"> lappend conf_files "${macports_user_dir}/macports.conf"
</span><span class="cx"> }
</span><span class="cx"> lappend conf_files "${macports_conf_path}/macports.conf"
</span></span></pre>
</div>
</div>
</body>
</html>