<!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>
Chris Lamb pushed to branch master
at <a href="https://salsa.debian.org/reproducible-builds/diffoscope">Reproducible Builds / diffoscope</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2bd5eca2af59f14e290c87c36840baed31c5ad99">2bd5eca2</a></strong>
<div>
<span>by Chris Lamb</span>
<i>at 2020-09-01T10:41:07+01:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Don't alias output from os.path.splitext to variables that we do not end up using.
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#c8a01e33bf53f897ac12b10d804c14ed751b4a8b">
diffoscope/comparators/deb.py
</a>
</li>
<li class="file-stats">
<a href="#bac4b9af457b145241613b80dba346341e1c99aa">
diffoscope/comparators/utils/libarchive.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="c8a01e33bf53f897ac12b10d804c14ed751b4a8b">
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2bd5eca2af59f14e290c87c36840baed31c5ad99#c8a01e33bf53f897ac12b10d804c14ed751b4a8b"><strong>diffoscope/comparators/deb.py</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="100" 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="100" 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">@@ -100,7 +100,7 @@ class DebContainer(LibarchiveContainer):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="100" 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">
100
</td>
<td class="diff-line-num new_line" data-linenumber="100" 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">
100
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC100" class="line" lang="python"> <span class="n" style="color: #333;">other_members</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">dict</span><span class="p">(</span><span class="n" style="color: #333;">other_members</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="101" 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">
101
</td>
<td class="diff-line-num new_line" data-linenumber="101" 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">
101
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC101" class="line" lang="python"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="102" 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">
102
</td>
<td class="diff-line-num new_line" data-linenumber="102" 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">
102
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC102" class="line" lang="python"> <span class="k" style="font-weight: 600;">for</span> <span class="n" style="color: #333;">name1</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">my_members</span><span class="p">.</span><span class="n" style="color: #333;">keys</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="103" 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">
103
</td>
<td class="diff-line-num new_line old" data-linenumber="103" 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="LC103" class="line" lang="python"> <span class="n" style="color: #333;">main</span><span class="p">,</span> <span class="n" style="color: #333;"><span class="idiff left right">ext</span></span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">path</span><span class="p">.</span><span class="n" style="color: #333;">splitext</span><span class="p">(</span><span class="n" style="color: #333;">name1</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="104" 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="diff-line-num new new_line" data-linenumber="103" 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">
103
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC103" class="line" lang="python"> <span class="n" style="color: #333;">main</span><span class="p">,</span> <span class="n" style="color: #333;"><span class="idiff left right">_</span></span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">path</span><span class="p">.</span><span class="n" style="color: #333;">splitext</span><span class="p">(</span><span class="n" style="color: #333;">name1</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="104" 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">
104
</td>
<td class="diff-line-num new_line" data-linenumber="104" 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">
104
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC104" class="line" lang="python"> <span class="n" style="color: #333;">candidates</span> <span class="o" style="font-weight: 600;">=</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="105" 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">
105
</td>
<td class="diff-line-num new_line" data-linenumber="105" 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">
105
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC105" class="line" lang="python"> <span class="n" style="color: #333;">name2</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="106" 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">
106
</td>
<td class="diff-line-num new_line" data-linenumber="106" 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">
106
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC106" class="line" lang="python"> <span class="k" style="font-weight: 600;">for</span> <span class="n" style="color: #333;">name2</span> <span class="ow" style="font-weight: 600;">in</span> <span class="n" style="color: #333;">other_members</span><span class="p">.</span><span class="n" style="color: #333;">keys</span><span class="p">()</span> <span class="o" style="font-weight: 600;">-</span> <span class="n" style="color: #333;">matched</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="bac4b9af457b145241613b80dba346341e1c99aa">
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2bd5eca2af59f14e290c87c36840baed31c5ad99#bac4b9af457b145241613b80dba346341e1c99aa"><strong>diffoscope/comparators/utils/libarchive.py</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="309" 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="309" 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">@@ -309,7 +309,7 @@ class LibarchiveContainer(Archive):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="309" 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">
309
</td>
<td class="diff-line-num new_line" data-linenumber="309" 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">
309
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC309" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># Keep directory sizes small. could be improved but should be</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="310" 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">
310
</td>
<td class="diff-line-num new_line" data-linenumber="310" 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">
310
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC310" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># good enough for "ordinary" large archives.</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="311" 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">
311
</td>
<td class="diff-line-num new_line" data-linenumber="311" 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">
311
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC311" class="line" lang="python"> <span class="n" style="color: #333;">dst</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">path</span><span class="p">.</span><span class="n" style="color: #333;">join</span><span class="p">(</span><span class="n" style="color: #333;">tmpdir</span><span class="p">,</span> <span class="nb" style="color: #0086b3;">str</span><span class="p">(</span><span class="n" style="color: #333;">idx</span> <span class="o" style="font-weight: 600;">//</span> <span class="mi" style="color: #099;">4096</span><span class="p">),</span> <span class="nb" style="color: #0086b3;">str</span><span class="p">(</span><span class="n" style="color: #333;">idx</span> <span class="o" style="font-weight: 600;">%</span> <span class="mi" style="color: #099;">4096</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="312" 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">
312
</td>
<td class="diff-line-num new_line old" data-linenumber="312" 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="LC312" class="line" lang="python"> <span class="n" style="color: #333;"><span class="idiff left right">root</span></span><span class="p">,</span> <span class="n" style="color: #333;">ext</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">path</span><span class="p">.</span><span class="n" style="color: #333;">splitext</span><span class="p">(</span><span class="n" style="color: #333;">entry</span><span class="p">.</span><span class="n" style="color: #333;">pathname</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="313" 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="diff-line-num new new_line" data-linenumber="312" 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">
312
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC312" class="line" lang="python"> <span class="n" style="color: #333;"><span class="idiff left right">_</span></span><span class="p">,</span> <span class="n" style="color: #333;">ext</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">os</span><span class="p">.</span><span class="n" style="color: #333;">path</span><span class="p">.</span><span class="n" style="color: #333;">splitext</span><span class="p">(</span><span class="n" style="color: #333;">entry</span><span class="p">.</span><span class="n" style="color: #333;">pathname</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="313" 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">
313
</td>
<td class="diff-line-num new_line" data-linenumber="313" 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">
313
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC313" class="line" lang="python"> <span class="n" style="color: #333;">dst</span> <span class="o" style="font-weight: 600;">+=</span> <span class="n" style="color: #333;">ext</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="314" 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">
314
</td>
<td class="diff-line-num new_line" data-linenumber="314" 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">
314
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC314" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># Maintain a mapping of archive path to the extracted path,</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="315" 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">
315
</td>
<td class="diff-line-num new_line" data-linenumber="315" 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">
315
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC315" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># avoiding the need to sanitise filenames.</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2bd5eca2af59f14e290c87c36840baed31c5ad99">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/reproducible-builds/diffoscope/-/commit/2bd5eca2af59f14e290c87c36840baed31c5ad99"}}</script>
</p>
</div>
</body>
</html>