Merge branch 'chisel-db-proxy' into chisel-db-report

canonical · Feb 5, 2024 · d2227b0 · d2227b0
2 parents 6d111ac + 9ee449f
commit d2227b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/internal/deb/extract.go b/internal/deb/extract.go
@@ -59,12 +59,8 @@ func Extract(pkgReader io.Reader, options *ExtractOptions) (err error) {
 	if err != nil {
 		return err
 	}
-	validOpts := *options
-	if validOpts.Creator == nil {
-		validOpts.Creator = fsutil.NewCreator()
-	}
 
-	_, err = os.Stat(validOpts.TargetDir)
+	_, err = os.Stat(options.TargetDir)
 	if os.IsNotExist(err) {
 		return fmt.Errorf("target directory does not exist")
 	} else if err != nil {
@@ -104,7 +100,7 @@ func Extract(pkgReader io.Reader, options *ExtractOptions) (err error) {
 			dataReader = zstdReader
 		}
 	}
-	return extractData(dataReader, &validOpts)
+	return extractData(dataReader, options)
 }
 
 func extractData(dataReader io.Reader, options *ExtractOptions) error {

diff --git a/internal/fsutil/create.go b/internal/fsutil/create.go
@@ -124,8 +124,8 @@ func createSymlink(o *CreateOptions) error {
 	return os.Symlink(o.Link, o.Path)
 }
 
-// readerProxy implements the io.Reader interface proxying the calls to its inner io.Reader. On each read, the proxy
-// calculates the file size and hash.
+// readerProxy implements the io.Reader interface proxying the calls to its
+// inner io.Reader. On each read, the proxy keeps track of the file size and hash.
 type readerProxy struct {
 	inner io.Reader
 	h     hash.Hash