| ... | @@ -567,18 +567,16 @@ fn runResource( | ... | @@ -567,18 +567,16 @@ fn runResource( |
| 567 | if (declared_hash.isOld()) { | 567 | if (declared_hash.isOld()) { |
| 568 | const actual_hex = Package.multiHashHexDigest(f.computed_hash.digest); | 568 | const actual_hex = Package.multiHashHexDigest(f.computed_hash.digest); |
| 569 | if (!std.mem.eql(u8, declared_hash.toSlice(), &actual_hex)) { | 569 | if (!std.mem.eql(u8, declared_hash.toSlice(), &actual_hex)) { |
| 570 | const declared = if (declared_hash.toSlice().len > 0) declared_hash.toSlice() else "<empty>"; | | |
| 571 | return f.fail(hash_tok, try eb.printString( | 570 | return f.fail(hash_tok, try eb.printString( |
| 572 | "hash mismatch: manifest declares {s} but the fetched package has {s}", | 571 | "hash mismatch: manifest declares '{s}' but the fetched package has '{s}'", |
| 573 | .{ declared, actual_hex }, | 572 | .{ declared_hash.toSlice(), actual_hex }, |
| 574 | )); | 573 | )); |
| 575 | } | 574 | } |
| 576 | } else { | 575 | } else { |
| 577 | if (!computed_package_hash.eql(&declared_hash)) { | 576 | if (!computed_package_hash.eql(&declared_hash)) { |
| 578 | const declared = if (declared_hash.toSlice().len > 0) declared_hash.toSlice() else "<empty>"; | | |
| 579 | return f.fail(hash_tok, try eb.printString( | 577 | return f.fail(hash_tok, try eb.printString( |
| 580 | "hash mismatch: manifest declares {s} but the fetched package has {s}", | 578 | "hash mismatch: manifest declares '{s}' but the fetched package has '{s}'", |
| 581 | .{ declared, computed_package_hash.toSlice() }, | 579 | .{ declared_hash.toSlice(), computed_package_hash.toSlice() }, |
| 582 | )); | 580 | )); |
| 583 | } | 581 | } |
| 584 | } | 582 | } |
Andrew Kelley <andrew@ziglang.org> 2025-06-06 11:16:44-07:00
src