From 1064b9dada6e9920f3f2e241bedb70570de032f5 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Thu, 3 Feb 2022 21:01:32 -0800 Subject: [PATCH] Missing newline in errors in bun install --- src/install/install.zig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/install/install.zig b/src/install/install.zig index 3065a6f722..61caf6d75a 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -251,6 +251,7 @@ const NetworkTask = struct { &this.request_buffer, 0, ); + this.http.max_retry_count = PackageManager.instance.options.max_retry_count; this.callback = .{ .package_manifest = .{ .name = try strings.StringOrTinyString.initAppendIfNeeded(name, *FileSystem.FilenameStore, &FileSystem.FilenameStore.instance), @@ -303,6 +304,7 @@ const NetworkTask = struct { 0, ); this.http.callback = notify; + this.http.max_retry_count = PackageManager.instance.options.max_retry_count; this.callback = .{ .extract = tarball }; } }; @@ -4532,8 +4534,9 @@ pub const PackageManager = struct { const response = task.http.response orelse { if (comptime log_level != .silent) { - const fmt = "\nerror: Failed to download package manifest {s}"; - const args = .{name.slice()}; + const fmt = "\nerror: {s} downloading package manifest {s}\n"; + const error_name: string = if (task.http.err) |err| std.mem.span(@errorName(err)) else "failed"; + const args = .{ error_name, name.slice() }; if (comptime log_level.showProgress()) { Output.prettyWithPrinterFn(fmt, args, Progress.log, &manager.progress); } else { @@ -4611,8 +4614,9 @@ pub const PackageManager = struct { }, .extract => |extract| { const response = task.http.response orelse { - const fmt = "\nFailed to download package tarball for package {s}\n"; - const args = .{extract.name.slice()}; + const fmt = "\nerror: {s} downloading tarball {s}@{s}\n"; + const error_name: string = if (task.http.err) |err| std.mem.span(@errorName(err)) else "failed"; + const args = .{ error_name, extract.name.slice(), extract.resolution.fmt(manager.lockfile.buffers.string_bytes.items) }; if (comptime log_level != .silent) { if (comptime log_level.showProgress()) {