Deploying to gh-pages from @ cac304f 🚀

Author: rbikar

__pycache__/__init__.cpython-39.pyc

@@ -452,6 +452,11 @@ <h1>Source code for pushsource._impl.backend.errata_source.errata_source</h1><di
     <span class="k">def</span><span class="w"> </span><span class="nf">_rpm_push_items_from_build</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">erratum</span><span class="p">,</span> <span class="n">build_nvr</span><span class="p">,</span> <span class="n">build_info</span><span class="p">):</span>
         <span class="n">rpms</span> <span class="o">=</span> <span class="n">build_info</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;rpms&quot;</span><span class="p">)</span> <span class="ow">or</span> <span class="p">{}</span>
         <span class="n">signing_key</span> <span class="o">=</span> <span class="n">build_info</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;sig_key&quot;</span><span class="p">)</span> <span class="ow">or</span> <span class="kc">None</span>
+        <span class="k">if</span> <span class="n">signing_key</span><span class="p">:</span>
+            <span class="c1"># Errata Tool API may return key alias in sig_key field in format &quot;name1,name2,...&quot;, but</span>
+            <span class="c1"># we need to convert &quot;,&quot; into &quot;+&quot; otherwise it would be used as multiple keys for Koji</span>
+            <span class="c1"># source which would result in incorrect processing.</span>
+            <span class="n">signing_key</span> <span class="o">=</span> <span class="n">signing_key</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s2">&quot;,&quot;</span><span class="p">,</span> <span class="s2">&quot;+&quot;</span><span class="p">)</span>
         <span class="n">sha256sums</span> <span class="o">=</span> <span class="p">(</span><span class="n">build_info</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;checksums&quot;</span><span class="p">)</span> <span class="ow">or</span> <span class="p">{})</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;sha256&quot;</span><span class="p">)</span> <span class="ow">or</span> <span class="p">{}</span>
         <span class="n">md5sums</span> <span class="o">=</span> <span class="p">(</span><span class="n">build_info</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;checksums&quot;</span><span class="p">)</span> <span class="ow">or</span> <span class="p">{})</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;md5&quot;</span><span class="p">)</span> <span class="ow">or</span> <span class="p">{}</span>
 

_modules/pushsource/_impl/backend/errata_source/errata_source.html

@@ -43,6 +43,16 @@ <h1>Source code for pushsource._impl.backend.koji_source</h1><div class="highlig
 <span class="kn">from</span><span class="w"> </span><span class="nn">more_executors</span><span class="w"> </span><span class="kn">import</span> <span class="n">Executors</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">more_executors.futures</span><span class="w"> </span><span class="kn">import</span> <span class="n">f_map</span>
 
+<span class="k">try</span><span class="p">:</span>
+    <span class="kn">from</span><span class="w"> </span><span class="nn">kobo</span><span class="w"> </span><span class="kn">import</span> <span class="n">rpmlib</span>
+<span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">ex</span><span class="p">:</span>  <span class="c1"># pragma: no cover, pylint: disable=broad-except</span>
+    <span class="c1"># If kobo.rpmlib is unavailable, let&#39;s not immediately crash.</span>
+    <span class="c1"># We will hold this exception and re-raise it only if there&#39;s an</span>
+    <span class="c1"># attempt to use the related functionality.</span>
+    <span class="kn">from</span><span class="w"> </span><span class="nn">..</span><span class="w"> </span><span class="kn">import</span> <span class="n">broken_rpmlib</span> <span class="k">as</span> <span class="n">rpmlib</span>
+
+    <span class="n">rpmlib</span><span class="o">.</span><span class="n">CAUSE</span> <span class="o">=</span> <span class="n">ex</span>
+
 <span class="kn">from</span><span class="w"> </span><span class="nn">..source</span><span class="w"> </span><span class="kn">import</span> <span class="n">Source</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">..model</span><span class="w"> </span><span class="kn">import</span> <span class="p">(</span>
     <span class="n">KojiBuildInfo</span><span class="p">,</span>
@@ -219,6 +229,8 @@ <h1>Source code for pushsource._impl.backend.koji_source</h1><div class="highlig
 <span class="sd">                using one of the provided keys. Include ``None`` if unsigned</span>
 <span class="sd">                should also be permitted.</span>
 
+<span class="sd">                Supports also key alias in the format ``name1+name2+...``</span>
+
 <span class="sd">                Keys should be listed in the order of preference.</span>
 
 <span class="sd">            basedir (str)</span>
@@ -252,7 +264,7 @@ <h1>Source code for pushsource._impl.backend.koji_source</h1><div class="highlig
         <span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_container_build</span> <span class="o">=</span> <span class="p">[</span><span class="n">try_int</span><span class="p">(</span><span class="n">x</span><span class="p">)</span> <span class="k">for</span> <span class="n">x</span> <span class="ow">in</span> <span class="n">list_argument</span><span class="p">(</span><span class="n">container_build</span><span class="p">)]</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_vmi_build</span> <span class="o">=</span> <span class="p">[</span><span class="n">try_int</span><span class="p">(</span><span class="n">x</span><span class="p">)</span> <span class="k">for</span> <span class="n">x</span> <span class="ow">in</span> <span class="n">list_argument</span><span class="p">(</span><span class="n">vmi_build</span><span class="p">)]</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">_signing_key</span> <span class="o">=</span> <span class="n">list_argument</span><span class="p">(</span><span class="n">signing_key</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_signing_key</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_parse_signing_key</span><span class="p">(</span><span class="n">list_argument</span><span class="p">(</span><span class="n">signing_key</span><span class="p">))</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_dest</span> <span class="o">=</span> <span class="n">list_argument</span><span class="p">(</span><span class="n">dest</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_timeout</span> <span class="o">=</span> <span class="n">timeout</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">_pathinfo</span> <span class="o">=</span> <span class="n">koji</span><span class="o">.</span><span class="n">PathInfo</span><span class="p">(</span><span class="n">basedir</span><span class="p">)</span>
@@ -288,6 +300,13 @@ <h1>Source code for pushsource._impl.backend.koji_source</h1><div class="highlig
                 <span class="n">tls</span><span class="o">.</span><span class="n">koji_session</span> <span class="o">=</span> <span class="n">koji</span><span class="o">.</span><span class="n">ClientSession</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_url</span><span class="p">,</span> <span class="p">{</span><span class="s2">&quot;anon_retry&quot;</span><span class="p">:</span> <span class="kc">True</span><span class="p">})</span>
         <span class="k">return</span> <span class="n">tls</span><span class="o">.</span><span class="n">koji_session</span>
 
+    <span class="k">def</span><span class="w"> </span><span class="nf">_parse_signing_key</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">keys</span><span class="p">):</span>
+        <span class="n">out</span> <span class="o">=</span> <span class="p">[]</span>
+        <span class="k">for</span> <span class="n">key</span> <span class="ow">in</span> <span class="n">keys</span><span class="p">:</span>
+            <span class="c1"># adjust alias to comma separated names of keys</span>
+            <span class="n">out</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">key</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s2">&quot;+&quot;</span><span class="p">,</span> <span class="s2">&quot;,&quot;</span><span class="p">)</span> <span class="k">if</span> <span class="n">key</span> <span class="k">else</span> <span class="n">key</span><span class="p">)</span>
+        <span class="k">return</span> <span class="n">out</span>
+
     <span class="k">def</span><span class="w"> </span><span class="nf">_koji_check</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="c1"># Do a basic connection check with koji.</span>
         <span class="c1"># If this succeeds, we can be reasonably sure that the koji connection is</span>
@@ -346,7 +365,6 @@ <h1>Source code for pushsource._impl.backend.koji_source</h1><div class="highlig
             <span class="n">candidate</span> <span class="o">=</span> <span class="n">unsigned_path</span>
 
         <span class="n">wait_exist</span><span class="p">(</span><span class="n">candidate</span><span class="p">,</span> <span class="n">timeout</span><span class="p">,</span> <span class="n">poll_rate</span><span class="p">)</span>
-
         <span class="c1"># If signing keys requested, try them in order of preference</span>
         <span class="c1"># Some key should be present at this stage, let&#39;s try them all</span>
         <span class="k">for</span> <span class="n">key</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">_signing_key</span><span class="p">:</span>
@@ -358,7 +376,10 @@ <h1>Source code for pushsource._impl.backend.koji_source</h1><div class="highlig
             <span class="n">candidate_paths</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">candidate</span><span class="p">)</span>
             <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">candidate</span><span class="p">):</span>
                 <span class="n">rpm_path</span> <span class="o">=</span> <span class="n">candidate</span>
-                <span class="n">rpm_signing_key</span> <span class="o">=</span> <span class="n">key</span>
+                <span class="c1"># we may only get key alias as input, let&#39;s extract actual key ID from RPM header in all cases</span>
+                <span class="c1"># as we don&#39;t know if the provided data are alias or actual key ID</span>
+                <span class="n">header</span> <span class="o">=</span> <span class="n">rpmlib</span><span class="o">.</span><span class="n">get_rpm_header</span><span class="p">(</span><span class="n">candidate</span><span class="p">)</span>
+                <span class="n">rpm_signing_key</span> <span class="o">=</span> <span class="n">rpmlib</span><span class="o">.</span><span class="n">get_keys_from_header</span><span class="p">(</span><span class="n">header</span><span class="p">)</span>
                 <span class="k">break</span>
 
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_signing_key</span><span class="p">:</span>

_modules/pushsource/_impl/backend/koji_source.html

@@ -157,6 +157,7 @@ <h2>Python API reference<a class="headerlink" href="#python-api-reference" title
 <li><p><strong>signing_key</strong> (<a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#list" title="(in Python v3.14)"><em>list</em></a><em>[</em><a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#str" title="(in Python v3.14)"><em>str</em></a><em>]</em>) – <p>GPG signing key ID(s). If provided, content must be signed
 using one of the provided keys. Include <code class="docutils literal notranslate"><span class="pre">None</span></code> if unsigned
 should also be permitted.</p>
+<p>Supports also key alias in the format <code class="docutils literal notranslate"><span class="pre">name1+name2+...</span></code></p>
 <p>Keys should be listed in the order of preference.</p>
 </p></li>
 <li><p><strong>basedir</strong> (<a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#str" title="(in Python v3.14)"><em>str</em></a>) – Base directory of koji content (e.g. /mnt/koji).