diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2022-02-03 21:01:32 -0800 |
|---|---|---|
| committer | Jarred Sumner <jarred@jarredsumner.com>
| 2022-02-03 21:01:32 -0800 |
| commit | 1064b9dada6e9920f3f2e241bedb70570de032f5 (patch) | |
| tree | 9f1a649bda8aff1a6f32a715fdd39e738c9bfcf1 | |
| parent | baffe26dd1e8da568fc77da53d36cd9c77d38c1d (diff) | |
| download | bun-1064b9dada6e9920f3f2e241bedb70570de032f5.tar.gz bun-1064b9dada6e9920f3f2e241bedb70570de032f5.tar.zst bun-1064b9dada6e9920f3f2e241bedb70570de032f5.zip | |
Missing newline in errors in bun install
| -rw-r--r-- | src/install/install.zig | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/install/install.zig b/src/install/install.zig index 3065a6f72..61caf6d75 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 = "\n<r><red>error<r>: Failed to download package manifest <b>{s}<r>"; - const args = .{name.slice()}; + const fmt = "\n<r><red>error<r>: {s} downloading package manifest <b>{s}<r>\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 = "\n<r><red>error<r>: {s} downloading tarball <b>{s}@{s}<r>\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()) { |