<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/16638">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">verify_*.py: Ignore UTF-8 decoding errors<br><br>Some of our source files are inherited from other sources, particularly<br>for microcontroller firmware projects.  We cannot assume they're all<br>clean UTF-8.  Let's ignore any decoder errors when verifying log<br>statements and value_string arrays.<br><br>Closes: OS#4334<br>Change-Id: I1e19f4bc6bee46481c6ea743e8334bd4485909be<br>---<br>M scripts/verify_log_statements.py<br>M scripts/verify_value_string_arrays_are_terminated.py<br>2 files changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/38/16638/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/verify_log_statements.py b/scripts/verify_log_statements.py</span><br><span>index 9a9cd1b..064df73 100755</span><br><span>--- a/scripts/verify_log_statements.py</span><br><span>+++ b/scripts/verify_log_statements.py</span><br><span>@@ -66,7 +66,7 @@</span><br><span>   try:</span><br><span>     errors_found = []</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    file_content = codecs.open(f, "r", "utf-8").read()</span><br><span style="color: hsl(120, 100%, 40%);">+    file_content = codecs.open(f, "r", "utf-8", errors='ignore').read()</span><br><span> </span><br><span>     for log in log_statement_re.finditer(file_content):</span><br><span>       quoted = log.group(2)</span><br><span>diff --git a/scripts/verify_value_string_arrays_are_terminated.py b/scripts/verify_value_string_arrays_are_terminated.py</span><br><span>index 9f0ad82..f6dc545 100755</span><br><span>--- a/scripts/verify_value_string_arrays_are_terminated.py</span><br><span>+++ b/scripts/verify_value_string_arrays_are_terminated.py</span><br><span>@@ -27,7 +27,7 @@</span><br><span>   global errors_found</span><br><span>   if not (f.endswith('.h') or f.endswith('.c') or f.endswith('.cpp')):</span><br><span>     return</span><br><span style="color: hsl(0, 100%, 40%);">-  arrays = value_string_array_re.findall(codecs.open(f, "r", "utf-8").read())</span><br><span style="color: hsl(120, 100%, 40%);">+  arrays = value_string_array_re.findall(codecs.open(f, "r", "utf-8", errors='ignore').read())</span><br><span>   for array_def, name in arrays:</span><br><span>     if not terminator_re.search(array_def):</span><br><span>       print('ERROR: file contains unterminated value_string %r: %r'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/16638">change 16638</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/16638"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1e19f4bc6bee46481c6ea743e8334bd4485909be </div>
<div style="display:none"> Gerrit-Change-Number: 16638 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>