<!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=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Emilio Pozuelo Monfort pushed to branch master
at <a href="https://salsa.debian.org/security-tracker-team/security-tracker">Debian Security Tracker / security-tracker</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/d1d7080019dc8118754e1992853986bf3fd964b7">d1d70800</a></strong>
<div>
<span>by Emilio Pozuelo Monfort</span>
<i>at 2021-05-14T13:38:22+02:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">merge-cve-files: fix variable name in assertion message
And slightly improve the message while at it.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#a2b7571da728ec3ff1a9e82debca8e48ecfcd171">
bin/merge-cve-files
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="a2b7571da728ec3ff1a9e82debca8e48ecfcd171">
<a href="https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/d1d7080019dc8118754e1992853986bf3fd964b7#a2b7571da728ec3ff1a9e82debca8e48ecfcd171"><strong>bin/merge-cve-files</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" 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="14" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="14" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -14,7 +14,7 @@ from sectracker.parsers import cvelist, writecvelist, PackageAnnotation, FlagAnn</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="14" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
14
</td>
<td class="new_line diff-line-num" data-linenumber="14" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
14
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC14" class="line" lang="python"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="15" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
15
</td>
<td class="new_line diff-line-num" data-linenumber="15" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
15
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC15" class="line" lang="python"><span class="k" style="font-weight: 600;">def</span> <span class="nf" style="color: #900; font-weight: 600;">merge_annotations</span><span class="p">(</span><span class="n" style="color: #333;">annotations</span><span class="p">,</span> <span class="n" style="color: #333;">new_annotation</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="16" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
16
</td>
<td class="new_line diff-line-num" data-linenumber="16" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
16
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC16" class="line" lang="python"> <span class="k" style="font-weight: 600;">if</span> <span class="ow" style="font-weight: 600;">not</span> <span class="nb" style="color: #0086b3;">isinstance</span><span class="p">(</span><span class="n" style="color: #333;">new_annotation</span><span class="p">,</span> <span class="n" style="color: #333;">PackageAnnotation</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="17" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
17
</td>
<td class="new_line diff-line-num old" data-linenumber="17" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC17" class="line" lang="python"> <span class="k" style="font-weight: 600;">raise</span> <span class="nb" style="color: #0086b3;">NotImplementedError</span><span class="p">(</span><span class="sa">f</span><span class="s" style="color: #d14;">"unsupported annotation of type </span><span class="si" style="color: #d14;">{</span><span class="nb" style="color: #0086b3;"><span class="idiff left">type</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;">annotation</span><span class="p">)</span><span class="si" style="color: #d14;"><span class="idiff right">}</span></span><span class="s" style="color: #d14;">"</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="18" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="17" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
17
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC17" class="line" lang="python"> <span class="k" style="font-weight: 600;">raise</span> <span class="nb" style="color: #0086b3;">NotImplementedError</span><span class="p">(</span><span class="sa">f</span><span class="s" style="color: #d14;">"unsupported annotation of type </span><span class="si" style="color: #d14;">{</span><span class="n" style="color: #333;"><span class="idiff left">new_annotation</span></span><span class="p"><span class="idiff">.</span></span><span class="nb" style="color: #0086b3;"><span class="idiff">type</span></span><span class="si" style="color: #d14;"><span class="idiff">}</span></span><span class="s" style="color: #d14;"><span class="idiff"> (line </span></span><span class="si" style="color: #d14;"><span class="idiff">{</span></span><span class="n" style="color: #333;"><span class="idiff">new_</span>annotation</span><span class="p"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">line</span></span><span class="si" style="color: #d14;"><span class="idiff right">}</span></span><span class="s" style="color: #d14;">)"</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="18" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
18
</td>
<td class="new_line diff-line-num" data-linenumber="18" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
18
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC18" class="line" lang="python"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="19" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
19
</td>
<td class="new_line diff-line-num" data-linenumber="19" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
19
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC19" class="line" lang="python"> <span class="n" style="color: #333;">annotations</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">list</span><span class="p">(</span><span class="n" style="color: #333;">annotations</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="20" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
20
</td>
<td class="new_line diff-line-num" data-linenumber="20" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
20
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC20" class="line" lang="python"></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #666;">
—
<br>
<a href="https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/d1d7080019dc8118754e1992853986bf3fd964b7">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
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://salsa.debian.org/security-tracker-team/security-tracker/-/commit/d1d7080019dc8118754e1992853986bf3fd964b7"}}</script>
</p>
</div>
</body>
</html>