<!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>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Holger Levsen pushed to branch master
at <a href="https://salsa.debian.org/qa/jenkins.debian.net">Debian QA / jenkins.debian.net</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/qa/jenkins.debian.net/commit/134df78f4d85d44b61bb807eeb15c0e847a63de6">134df78f</a></strong>
<div>
<span>by Holger Levsen</span>
<i>at 2018-04-20T22:59:04-03:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Revert "YOLO fixup for 88ff3aaf: reproducible Debian: add support for common-$DPKG_ARCH files"
This reverts commit 8ab28c5caac2320c9e0de9a6afb4914f1f627665.
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/qa/jenkins.debian.net/commit/624a7f2f4331cfebd303ad0853a22bd6824da83d">624a7f2f</a></strong>
<div>
<span>by Holger Levsen</span>
<i>at 2018-04-20T23:01:14-03:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">reproducible Debian: always run apt-get update (but sometimes only update sources.list later...)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#6ff6282ac74cc7287e3dd50fb4425669c13e79fc">
update_jdn.sh
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="6ff6282ac74cc7287e3dd50fb4425669c13e79fc">
<a href="https://salsa.debian.org/qa/jenkins.debian.net/compare/5c0becb71394c918ed34aa0659dfa4b46b7813c9...624a7f2f4331cfebd303ad0853a22bd6824da83d#6ff6282ac74cc7287e3dd50fb4425669c13e79fc"><strong>update_jdn.sh</strong></a>
<hr>
<table class="code white" style="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="495" 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="495" 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">@@ -495,7 +495,7 @@ if [ -f /etc/debian_version ] ; then</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="495" 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">
495
</td>
<td class="diff-line-num new_line" data-linenumber="495" 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">
495
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC495" class="line" lang="shell"> <span class="k" style="font-weight: 600;">else</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="496" 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">
496
</td>
<td class="diff-line-num new_line" data-linenumber="496" 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">
496
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC496" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nv" style="color: teal;">MASTERDEBS</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">""</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="497" 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">
497
</td>
<td class="diff-line-num new_line" data-linenumber="497" 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">
497
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC497" class="line" lang="shell"> <span class="k" style="font-weight: 600;">fi</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="498" 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">
498
</td>
<td class="diff-line-num new_line old" data-linenumber="498" 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 noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC498" class="line" lang="shell"> <span class="nv" style="color: teal;">$UP2DATE</span> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;"><span class="idiff left">(</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">sudo </span></span><span class="idiff">cp </span><span class="nt" style="color: navy;"><span class="idiff">--preserve</span></span><span class="o" style="font-weight: 600;"><span class="idiff">=</span></span><span class="idiff">mode,timestamps </span><span class="nt" style="color: navy;"><span class="idiff">-r</span></span><span class="idiff"> hosts/</span><span class="nv" style="color: teal;"><span class="idiff">$HOSTNAME</span></span><span class="idiff">/etc/apt/sources.list /etc/apt </span><span class="p"><span class="idiff">;</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">sudo </span></span><span class="idiff">apt-get update </span><span class="o" style="font-weight: 600;"><span class="idiff right">)</span></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="499" 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="498" 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">
498
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC498" class="line" lang="shell"> <span class="nv" style="color: teal;">$UP2DATE</span> <span class="o" style="font-weight: 600;">||</span> <span class="nb" style="color: #0086b3;"><span class="idiff left">sudo </span></span><span class="idiff right">apt-get update</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="499" 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">
499
</td>
<td class="diff-line-num new_line" data-linenumber="499" 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">
499
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC499" class="line" lang="shell"> <span class="nv" style="color: teal;">$UP2DATE</span> <span class="o" style="font-weight: 600;">||</span> <span class="nb" style="color: #0086b3;">sudo </span>apt-get install <span class="nv" style="color: teal;">$DEBS</span> <span class="nv" style="color: teal;">$MASTERDEBS</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="500" 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">
500
</td>
<td class="diff-line-num new_line" data-linenumber="500" 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">
500
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC500" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># dont (re-)install pbuilder if it's on hold</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="501" 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">
501
</td>
<td class="diff-line-num new_line" data-linenumber="501" 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">
501
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC501" class="line" lang="shell"> <span class="k" style="font-weight: 600;">if</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="k" style="font-weight: 600;">$(</span>dpkg-query <span class="nt" style="color: navy;">-W</span> <span class="nt" style="color: navy;">-f</span><span class="o" style="font-weight: 600;">=</span><span class="s1" style="color: #d14;">'${db:Status-Abbrev}\n'</span> pbuilder<span class="k" style="font-weight: 600;">)</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">!=</span> <span class="s2" style="color: #d14;">"hi "</span> <span class="o" style="font-weight: 600;">]</span> <span class="p">;</span> <span class="k" style="font-weight: 600;">then</span></span>
</pre>
</td>
</tr>
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="555" 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="555" 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">@@ -555,7 +555,7 @@ for h in common common-amd64 common-i386 common-arm64 common-armhf "$HOSTNAME" ;</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="555" 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">
555
</td>
<td class="diff-line-num new_line" data-linenumber="555" 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">
555
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC555" class="line" lang="shell"><span class="k" style="font-weight: 600;"> fi</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="556" 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">
556
</td>
<td class="diff-line-num new_line" data-linenumber="556" 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">
556
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC556" class="line" lang="shell"><span class="k" style="font-weight: 600;"> for </span>d <span class="k" style="font-weight: 600;">in </span>etc usr <span class="p">;</span> <span class="k" style="font-weight: 600;">do</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="557" 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">
557
</td>
<td class="diff-line-num new_line" data-linenumber="557" 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">
557
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC557" class="line" lang="shell"><span class="k" style="font-weight: 600;"> if</span> <span class="o" style="font-weight: 600;">[</span> <span class="nt" style="color: navy;">-d</span> <span class="s2" style="color: #d14;">"hosts/</span><span class="nv" style="color: teal;">$h</span><span class="s2" style="color: #d14;">/</span><span class="nv" style="color: teal;">$d</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">]</span><span class="p">;</span> <span class="k" style="font-weight: 600;">then</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="558" 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">
558
</td>
<td class="diff-line-num new_line old" data-linenumber="558" 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 noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC558" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">sudo </span>cp <span class="nt" style="color: navy;">--preserve</span><span class="o" style="font-weight: 600;">=</span>mode,timestamps <span class="nt" style="color: navy;">-r</span> <span class="s2" style="color: #d14;">"hosts/</span><span class="nv" style="color: teal;">$h</span><span class="s2" style="color: #d14;">/</span><span class="nv" style="color: teal;">$d</span><span class="s2" style="color: #d14;">/"</span><span class="k" style="font-weight: 600;">*</span> <span class="s2" style="color: #d14;">"/</span><span class="nv" style="color: teal;">$d</span><span class="s2" style="color: #d14;">"</span><span class="idiff left"> </span><span class="o" style="font-weight: 600;"><span class="idiff">||</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">true</span></span><span class="idiff"> </span><span class="c" style="color: #998; font-style: italic;"><span class="idiff right"># YOLO or better use src:fai's fcopy</span></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="559" 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="558" 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">
558
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC558" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">sudo </span>cp <span class="nt" style="color: navy;">--preserve</span><span class="o" style="font-weight: 600;">=</span>mode,timestamps <span class="nt" style="color: navy;">-r</span> <span class="s2" style="color: #d14;">"hosts/</span><span class="nv" style="color: teal;">$h</span><span class="s2" style="color: #d14;">/</span><span class="nv" style="color: teal;">$d</span><span class="s2" style="color: #d14;">/"</span><span class="k" style="font-weight: 600;">*</span> <span class="s2" style="color: #d14;">"/</span><span class="nv" style="color: teal;">$d</span><span class="s2" style="color: #d14;">"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="559" 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">
559
</td>
<td class="diff-line-num new_line" data-linenumber="559" 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">
559
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC559" class="line" lang="shell"> <span class="k" style="font-weight: 600;">fi</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="560" 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">
560
</td>
<td class="diff-line-num new_line" data-linenumber="560" 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">
560
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC560" class="line" lang="shell"><span class="k" style="font-weight: 600;"> done</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="561" 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">
561
</td>
<td class="diff-line-num new_line" data-linenumber="561" 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">
561
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC561" class="line" lang="shell"><span class="k" style="font-weight: 600;">done</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/qa/jenkins.debian.net/compare/5c0becb71394c918ed34aa0659dfa4b46b7813c9...624a7f2f4331cfebd303ad0853a22bd6824da83d">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.
</p>
</div>
</body>
</html>