diff options
| author |  Alex Lam S.L <alexlamsl@gmail.com>
| 2023-04-25 15:13:57 +0300 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-04-25 15:13:57 +0300 |
| commit | 460563ee8996d721d341f3ae0f704a9e3a1ba38d (patch) | |
| tree | 50741c62e81069633a3033e8ad8128f48624246c /src/install/install.zig | |
| parent | 3c4f0920b95cfffc52d13cb0211701ca55211164 (diff) | |
| download | bun-460563ee8996d721d341f3ae0f704a9e3a1ba38d.tar.gz bun-460563ee8996d721d341f3ae0f704a9e3a1ba38d.tar.zst bun-460563ee8996d721d341f3ae0f704a9e3a1ba38d.zip | |
fix `make setup` (#2731)
- minor clean-ups
Diffstat (limited to 'src/install/install.zig')
| -rw-r--r-- | src/install/install.zig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/install/install.zig b/src/install/install.zig index 54131fc2a..51cdedea6 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -2469,8 +2469,9 @@ pub const PackageManager = struct { std.debug.assert(buffers.resolutions.items[dependency_id] == invalid_package_id); } buffers.resolutions.items[dependency_id] = package_id; + const string_buf = buffers.string_bytes.items; var dep = &buffers.dependencies.items[dependency_id]; - if (dep.name.isEmpty()) { + if (dep.name.isEmpty() or strings.eql(dep.name.slice(string_buf), dep.version.literal.slice(string_buf))) { dep.name = this.lockfile.packages.items(.name)[package_id]; dep.name_hash = this.lockfile.packages.items(.name_hash)[package_id]; } @@ -2484,8 +2485,9 @@ pub const PackageManager = struct { std.debug.assert(buffers.resolutions.items[dependency_id] == invalid_package_id); } buffers.resolutions.items[dependency_id] = package_id; + const string_buf = buffers.string_bytes.items; var dep = &buffers.dependencies.items[dependency_id]; - if (dep.name.isEmpty()) { + if (dep.name.isEmpty() or strings.eql(dep.name.slice(string_buf), dep.version.literal.slice(string_buf))) { dep.name = this.lockfile.packages.items(.name)[package_id]; dep.name_hash = this.lockfile.packages.items(.name_hash)[package_id]; } |