<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://reviewboard.asterisk.org/r/2684/">https://reviewboard.asterisk.org/r/2684/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Can't reproduce.
My asterisk-trunk skips [directories](!).
I broke a path, and it starts only when I added "(!)", which leads me to believe that it doesn't read it then.</pre>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://reviewboard.asterisk.org/r/2684/diff/1/?file=41596#file41596line681" style="color: black; font-weight: bold; text-decoration: underline;">/trunk/main/config.c</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static struct ast_category *category_get(const struct ast_config *config, const char *category_name, int ignored)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">681</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="k">return</span> <span class="n">category_get</span><span class="p">(</span><span class="n">config</span><span class="p">,</span> <span class="n">category_name</span><span class="p">,</span> <span class="mi"><span class="hl">0</span></span><span class="p">);</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">681</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="tb"> </span><span class="k">return</span> <span class="n">category_get</span><span class="p">(</span><span class="n">config</span><span class="p">,</span> <span class="n">category_name</span><span class="p">,</span> <span class="mi"><span class="hl">1</span></span><span class="p">);</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Looks to me like your fix *creates* broken behaviour instead of fixing it.
As far as I can tell, that flag 1 means "include ignored/templates".
static struct ast_category *category_get(const struct ast_config *config, const char *category_name, int ignored)
...
if (cat->name == category_name && (ignored || !cat->ignored))
return cat;
cat->ignored is set if "!" is encountered. The passed variable should be named "include_ignored", and it should be 0 when we don't want templates.
(0 || !1) == false => skip templates</pre>
</div>
<br />
<p>- wdoekes</p>
<br />
<p>On July 18th, 2013, 1:44 p.m. UTC, Russell Bryant wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://reviewboard.asterisk.org/static/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Asterisk Developers.</div>
<div>By Russell Bryant.</div>
<p style="color: grey;"><i>Updated July 18, 2013, 1:44 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
Asterisk
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">While working on a deployment, I had to change the [directories] section of asterisk.conf from the defaults. That worked. Later I noticed that the directories section was defined as a template-only section like so:
[directories](!)
which means my changes should *not* have taken effect. This one line change fixes that.
As a side note, while looking at this, I noticed multiple cases of comparing against a category name like this throughout the file, which seems wrong:
from ast_category_delete()
if (cat->name == category) {
from ast_variable_browse()
if (config->last_browse && (config->last_browse->name == category)) {
etc.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>/trunk/main/config.c <span style="color: grey">(394685)</span></li>
</ul>
<p><a href="https://reviewboard.asterisk.org/r/2684/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>