mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-12 03:48:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[autofix.ci] apply automated fixes

Browse Source
This commit is contained in:
autofix-ci[bot]
2025-08-12 04:19:59 +00:00
committed by GitHub
parent d56ce9b5be
commit 369e9bc549
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/install/PackageManager/PackageManagerEnqueue.zig
View File

@@ -1285,12 +1285,12 @@ pub fn enqueueGitCheckout(
) void {
const folder_name = PackageManager.cachedGitFolderNamePrint(&git_folder_name_buf, resolved, null);
const target = Path.joinAbsString(this.cache_directory_path, &.{folder_name}, .auto);
// Check if the checkout directory already exists - if so, just return success immediately
if (this.getCacheDirectory().openDir(folder_name, .{})) |package_dir_const| {
var package_dir = package_dir_const;
package_dir.close();
// Directory already exists, create a success task immediately
const task = this.preallocated_resolve_tasks.get();
task.* = Task{
@@ -1328,7 +1328,7 @@ pub fn enqueueGitCheckout(
this.wake();
return;
} else |_| {}
const repo_path = bun.getFdPath(dir, &git_path_buf) catch |err| {
// If we can't get the path, create a failed task
const task = this.preallocated_resolve_tasks.get();

18
src/install/PackageManager/runTasks.zig
View File

@@ -766,7 +766,7 @@ pub fn runTasks(
var resolution_buf: [8192]u8 = undefined;
var stream = std.io.fixedBufferStream(&resolution_buf);
var writer = stream.writer();
// Write the git resolution format
if (strings.hasPrefixComptime(repo, "git@")) {
// Transform SCP-like URL to SSH URL format
@@ -781,22 +781,22 @@ pub fn runTasks(
}
writer.writeByte('#') catch unreachable;
writer.writeAll(resolved) catch unreachable;
const package_version = stream.getWritten();
// Calculate the hash for "name@version"
var name_and_version_buf: [8192]u8 = undefined;
const name_and_version = std.fmt.bufPrint(&name_and_version_buf, "{s}@{s}", .{
dep_name,
package_version,
}) catch unreachable;
const hash = String.Builder.stringHash(name_and_version);
if (comptime Environment.isDebug) {
Output.prettyErrorln("[git-patch] Looking for patch: {s} (hash={d})", .{ name_and_version, hash });
}
// Check if this dependency has a patch
if (manager.lockfile.patched_dependencies.get(hash)) |_| {
if (comptime Environment.isDebug) {
@@ -804,7 +804,7 @@ pub fn runTasks(
}
break :brk hash;
}
// Also try checking all patched dependencies to see what we have
if (comptime Environment.isDebug) {
var iter = manager.lockfile.patched_dependencies.iterator();
@@ -812,7 +812,7 @@ pub fn runTasks(
Output.prettyErrorln("[git-patch] Available patch: hash={d}", .{entry.key_ptr.*});
}
}
break :brk null;
} else null;
@@ -1148,6 +1148,7 @@ const ThreadPool = bun.ThreadPool;
const default_allocator = bun.default_allocator;
const logger = bun.logger;
const strings = bun.strings;
const String = bun.Semver.String;
const Fs = bun.fs;
const FileSystem = Fs.FileSystem;
@@ -1166,7 +1167,6 @@ const Repository = bun.install.Repository;
const Store = bun.install.Store;
const Task = bun.install.Task;
const invalid_package_id = bun.install.invalid_package_id;
const String = bun.Semver.String;
const Lockfile = bun.install.Lockfile;
const Package = Lockfile.Package;