<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Eric S. Raymond pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/914fde0c580418ceeefdfd277369a4d59b91c9c7">914fde0c</a></strong>
<div>
<span>by Ian Bruene</span>
<i>at 2017-03-20T13:46:31-05:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Added try/except guard to --width option integer conversion
Previously the option handling in the if __name__ == '__main__': block was
inconsistent; the -D option wrote a message to stderr and did
raise SystemExit if the option could not be converted to an int. But the
-W option did not have this guard, despite also requiring an int and having
no obvious reason why it shouldn't be guarded.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#f02a16b09a60cd9a00ca251063355e22152519dc">
ntpclients/ntpq
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="f02a16b09a60cd9a00ca251063355e22152519dc">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/914fde0c580418ceeefdfd277369a4d59b91c9c7#f02a16b09a60cd9a00ca251063355e22152519dc"><strong>ntpclients/ntpq</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="1623" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="1623" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -1623,7 +1623,12 @@ if __name__ == '__main__':</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1623" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1623
</td>
<td class="diff-line-num new_line" data-linenumber="1623" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1623
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1623" class="line"> <span class="k" style="font-weight: bold">elif</span> <span class="n" style="color: #333">switch</span> <span class="ow" style="font-weight: bold">in</span> <span class="p">(</span><span class="s" style="color: #d14">"-w"</span><span class="p">,</span> <span class="s" style="color: #d14">"--wide"</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1624" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1624
</td>
<td class="diff-line-num new_line" data-linenumber="1624" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1624
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1624" class="line"> <span class="n" style="color: #333">interpreter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">wideremote</span> <span class="o" style="font-weight: bold">=</span> <span class="bp" style="color: #999">True</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1625" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1625
</td>
<td class="diff-line-num new_line" data-linenumber="1625" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1625
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1625" class="line"> <span class="k" style="font-weight: bold">elif</span> <span class="n" style="color: #333">switch</span> <span class="ow" style="font-weight: bold">in</span> <span class="p">(</span><span class="s" style="color: #d14">"-W"</span><span class="p">,</span> <span class="s" style="color: #d14">"--width"</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6">
<td class="diff-line-num old old_line" data-linenumber="1626" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
1626
</td>
<td class="diff-line-num new_line old" data-linenumber="1626" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC1626" class="line"> <span class="n" style="color: #333">interpreter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">termwidth</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="1627" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1626" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1626
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC1626" class="line"> <span class="k" style="font-weight: bold">try</span><span class="p">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="1627" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1627" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1627
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC1627" class="line"> <span class="n" style="color: #333">interpreter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">termwidth</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">val</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="1627" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1628" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1628
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC1628" class="line"> <span class="k" style="font-weight: bold">except</span> <span class="nb" style="color: #0086b3">ValueError</span> <span class="k" style="font-weight: bold">as</span> <span class="n" style="color: #333">e</span><span class="p">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="1627" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1629" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1629
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC1629" class="line"> <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">stderr</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">write</span><span class="p">(</span><span class="s" style="color: #d14">"'</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">s' is not a recognizable number</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span> <span class="o" style="font-weight: bold">%</span> <span class="n" style="color: #333">val</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="1627" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1630" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1630
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC1630" class="line"> <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">stderr</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">write</span><span class="p">(</span><span class="n" style="color: #333">usage</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="1627" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1631" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1631
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC1631" class="line"> <span class="k" style="font-weight: bold">raise</span> <span class="nb" style="color: #0086b3">SystemExit</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1627" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1627
</td>
<td class="diff-line-num new_line" data-linenumber="1632" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1632
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1632" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1628" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1628
</td>
<td class="diff-line-num new_line" data-linenumber="1633" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1633
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1633" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">interpreter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">interactive</span> <span class="ow" style="font-weight: bold">and</span> <span class="nb" style="color: #0086b3">len</span><span class="p">(</span><span class="n" style="color: #333">interpreter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">ccmds</span><span class="p">)</span> <span class="o" style="font-weight: bold">></span> <span class="mi" style="color: #099">0</span><span class="p">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="1629" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1629
</td>
<td class="diff-line-num new_line" data-linenumber="1634" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1634
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC1634" class="line"> <span class="n" style="color: #333">interpreter</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">warn</span><span class="p">(</span><span class="s" style="color: #d14">"</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">s: invalid option combination.</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span> <span class="o" style="font-weight: bold">%</span> <span class="n" style="color: #333">progname</span><span class="p">)</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/914fde0c580418ceeefdfd277369a4d59b91c9c7">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/914fde0c580418ceeefdfd277369a4d59b91c9c7"}}</script>
</p>
</div>
</body>
</html>