From 02aed32bf2627a969c15f358737abf5acb697dd4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 18 Sep 2023 12:34:33 +0300 Subject: refactor(tvix/nar-bridge): rename contentReader to blobReader More aligned with how it's called in other places Change-Id: I759ac7ca3b5b69c1101d2d51a569d76c183a6330 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9362 Reviewed-by: Connor Brewster Autosubmit: flokli Tested-by: BuildkiteCI --- tvix/nar-bridge/pkg/writer/writer.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tvix') diff --git a/tvix/nar-bridge/pkg/writer/writer.go b/tvix/nar-bridge/pkg/writer/writer.go index 25510f933e..e69cf27f2a 100644 --- a/tvix/nar-bridge/pkg/writer/writer.go +++ b/tvix/nar-bridge/pkg/writer/writer.go @@ -54,18 +54,18 @@ func Export( } // if it's a regular file, retrieve and write the contents - contentReader, err := blobLookupFn(v.File.GetDigest()) + blobReader, err := blobLookupFn(v.File.GetDigest()) if err != nil { return fmt.Errorf("unable to lookup blob: %w", err) } - defer contentReader.Close() + defer blobReader.Close() - _, err = io.Copy(narWriter, contentReader) + _, err = io.Copy(narWriter, blobReader) if err != nil { - return fmt.Errorf("unable to copy contents from contentReader: %w", err) + return fmt.Errorf("unable to read from blobReader: %w", err) } - err = contentReader.Close() + err = blobReader.Close() if err != nil { return fmt.Errorf("unable to close content reader: %w", err) } -- cgit 1.4.1