Skip to content
This repository was archived by the owner on Aug 22, 2020. It is now read-only.

Commit a7cf450

Browse files
committed
As a first step towards line-based manifest file deprecation, stop returning line-based parsing errors
1 parent e326c47 commit a7cf450

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

manifest/parse.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ func Parse(reader io.Reader) (*Manifest2822, error) {
1515
if err2822 != nil {
1616
manifest, err := ParseLineBased(buf)
1717
if err != nil {
18-
return nil, fmt.Errorf("cannot parse manifest in either format:\nRFC 2822 error: %v\nLine-based error: %v", err2822, err)
18+
// if we fail parsing line-based, eat the error and return the 2822 parsing error instead
19+
// https://github.com/docker-library/bashbrew/issues/16
20+
return nil, err2822
1921
}
2022
return manifest, nil
2123
}

0 commit comments

Comments
 (0)