Error messages not being reported unless more then one error present

Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan · Jan 4, 2024 · f0319d5 · f0319d5
1 parent a1da24d
commit f0319d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cmd/quadlet/main.go b/cmd/quadlet/main.go
@@ -230,7 +230,9 @@ func loadUnitsFromDir(sourcePath string) ([]*parser.UnitFile, error) {
 
 			if f, err := parser.ParseUnitFile(path); err != nil {
 				err = fmt.Errorf("error loading %q, %w", path, err)
-				if prevError != nil {
+				if prevError == nil {
+					prevError = err
+				} else {
 					prevError = fmt.Errorf("%s\n%s", prevError, err)
 				}
 			} else {

diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go
@@ -639,6 +639,7 @@ BOGUS=foo
 			session := podmanTest.Quadlet([]string{"-dryrun"}, podmanTest.TempDir)
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(Exit(1))
+			Expect(session.ErrorToString()).To(ContainSubstring("converting \"bogus.container\": unsupported key 'BOGUS' in group 'Container' in " + quadletfilePath))
 		})
 
 		It("Should scan and return output for files in subdirectories", func() {