cargo: unify call to PackageDefinition.from_values

Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

mesonbuild/cargo/interpreter.py

@@ -831,26 +831,29 @@ def load_cargo_lock(filename: str, subproject_dir: str) -> T.Optional[CargoLock]
                     checksum = cargolock.metadata[f'checksum {package.name} {package.version} ({package.source})']
                 url = f'https://crates.io/api/v1/crates/{package.name}/{package.version}/download'
                 directory = f'{package.name}-{package.version}'
-                if directory not in wraps:
-                    wraps[directory] = PackageDefinition.from_values(meson_depname, subproject_dir, 'file', {
-                        'directory': directory,
-                        'source_url': url,
-                        'source_filename': f'{directory}.tar.gz',
-                        'source_hash': checksum,
-                        'method': 'cargo',
-                    })
-                wraps[directory].add_provided_dep(meson_depname)
+                name = meson_depname
+                cfg = {
+                    'directory': directory,
+                    'source_url': url,
+                    'source_filename': f'{directory}.tar.gz',
+                    'source_hash': checksum,
+                    'method': 'cargo',
+                }
             elif package.source.startswith('git+'):
                 url, revision, directory = _parse_git_url(package.source)
-                if directory not in wraps:
-                    wraps[directory] = PackageDefinition.from_values(directory, subproject_dir, 'git', {
-                        'url': url,
-                        'revision': revision,
-                        'method': 'cargo',
-                    })
+                name = directory
+                cfg = {
+                    'url': url,
+                    'revision': revision,
+                    'method': 'cargo',
+                }
                 wraps[directory].add_provided_dep(meson_depname)
             else:
                 mlog.warning(f'Unsupported source URL in {filename}: {package.source}')
+                continue
+            if directory not in wraps:
+                wraps[directory] = PackageDefinition.from_values(name, subproject_dir, 'file', cfg)
+            wraps[directory].add_provided_dep(meson_depname)
         cargolock.wraps = {w.name: w for w in wraps.values()}
         return cargolock
     return None