Fix missed TranslatePaths and unreported error.
authorTom Clegg <tom@tomclegg.ca>
Wed, 1 Sep 2021 17:44:57 +0000 (13:44 -0400)
committerTom Clegg <tom@tomclegg.ca>
Wed, 1 Sep 2021 17:44:57 +0000 (13:44 -0400)
refs #17562

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

export.go

index b6b6263117c0db461ec424521341ce2e0177210d..c74baeb6451ef9374069d53f449f8b947e1d93a4 100644 (file)
--- a/export.go
+++ b/export.go
@@ -133,7 +133,7 @@ func (cmd *exporter) RunCommand(prog string, args []string, stdin io.Reader, std
                        Priority:    *priority,
                        APIAccess:   true,
                }
-               err = runner.TranslatePaths(inputDir)
+               err = runner.TranslatePaths(inputDir, cases)
                if err != nil {
                        return 1
                }
@@ -223,11 +223,14 @@ func (cmd *exporter) RunCommand(prog string, args []string, stdin io.Reader, std
        cmd.cases = make([]bool, len(names))
        if *cases != "" {
                log.Infof("reading cases file: %s", *cases)
-               f, err := open(*cases)
+               var f io.ReadCloser
+               f, err = open(*cases)
                if err != nil {
                        return 1
                }
-               buf, err := io.ReadAll(f)
+               defer f.Close()
+               var buf []byte
+               buf, err = io.ReadAll(f)
                if err != nil {
                        return 1
                }