Merge pull request #2867 from AdamWill/solver-fixes

Log metalink URI when resolve fails, handle zstd-compressed repo metadata

Author: Conan-Kudo

kiwi/solver/repository/base.py

@@ -311,9 +311,10 @@ def _create_solvables(self, metadata_dir, tool):
             if tool == 'deb2solv':
                 tool_options.append('-r')
             for source in glob.iglob('/'.join([metadata_dir, '*'])):
-                bash_command = [
-                    'gzip', '-cd', '--force', source, '|', tool
-                ] + tool_options + [
+                bash_command = ['gzip', '-cd', '--force']
+                if source.endswith('.zst'):
+                    bash_command = ['zstd', '-dcf']
+                bash_command += [source, '|', tool] + tool_options + [
                     '>', self._get_random_solvable_name()
                 ]
                 Command.run(['bash', '-c', ' '.join(bash_command)])

kiwi/system/uri.py

@@ -362,7 +362,7 @@ def _resolve_metalink_uri(self, uri: str) -> str:
                     start_preference = preference
         except Exception as issue:
             raise KiwiUriOpenError(
-                f'Failed to resolve metalink URI: {issue}'
+                f'Failed to resolve metalink URI {uri}: {issue}'
             )
         selected_repo_source = selected_repo_source.replace(
             'repodata/repomd.xml', ''

test/unit/solver/repository/base_test.py

@@ -299,22 +299,32 @@ def test__create_solvables_rpms2_solv(
     def test__create_solvables_rpmmd2_solv(
         self, mock_glob, mock_command, mock_rand, mock_Temporary
     ):
-        mock_glob.return_value = ['some-solv-data-file']
+        mock_glob.return_value = ['some-solv-data-file', 'some-solv-data-file.zst']
         mock_rand.return_value = 0xfe
         self.solver.repository_metadata_dirs = ['metadata_dir.XXXX']
         mock_Temporary.return_value.new_dir.return_value.name = 'solv_dir.XX'
         self.solver._create_solvables('meta_dir.XX', 'rpmmd2solv')
         mock_glob.assert_called_once_with('meta_dir.XX/*')
-        mock_command.assert_called_once_with(
-            [
-                'bash', '-c',
+        assert mock_command.mock_calls == [
+            call([
+                'bash',
+                '-c',
                 ' '.join([
                     'gzip -cd --force some-solv-data-file',
                     '|',
                     'rpmmd2solv > solv_dir.XX/solvable-fefefefe'
                 ])
-            ]
-        )
+            ]),
+            call([
+                'bash',
+                '-c',
+                ' '.join([
+                    'zstd -dcf some-solv-data-file.zst',
+                    '|',
+                    'rpmmd2solv > solv_dir.XX/solvable-fefefefe'
+                ])
+            ])
+        ]
 
     @patch('kiwi.solver.repository.base.Temporary')
     @patch('kiwi.solver.repository.base.random.randrange')