Merge pull request #153 from nalind/make-not-exist-error

rhatdan · web-flow · commit edcddd848304 · 2020-03-17T08:25:49.000-04:00
archiveFromContainer(): return possibly-wrapped os.IsNotError
diff --git a/dockerclient/archive.go b/dockerclient/archive.go
@@ -224,7 +224,7 @@ func archiveFromContainer(in io.Reader, src, dst string, excludes []string, chec
 	r, err := transformArchive(in, false, mapper.Filter)
 	rc := readCloser{Reader: r, Closer: newCloser(func() error {
 		if !mapper.foundItems {
-			return fmt.Errorf("%v: %s", os.ErrNotExist, src)
+			return makeNotExistError(src)
 		}
 		return nil
 	})}

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func archiveFromContainer(in io.Reader, src, dst string, excludes []string, chec`
`224`	`224`	`r, err := transformArchive(in, false, mapper.Filter)`
`225`	`225`	`rc := readCloser{Reader: r, Closer: newCloser(func() error {`
`226`	`226`	`if !mapper.foundItems {`
`227`		`- return fmt.Errorf("%v: %s", os.ErrNotExist, src)`
	`227`	`+ return makeNotExistError(src)`
`228`	`228`	`}`
`229`	`229`	`return nil`
`230`	`230`	`})}`