aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/containers/storage/pkg/chrootarchive/archive.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/containers/storage/pkg/chrootarchive/archive.go')
-rw-r--r--vendor/github.com/containers/storage/pkg/chrootarchive/archive.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/archive.go b/vendor/github.com/containers/storage/pkg/chrootarchive/archive.go
index d66c98b30..b5d8961e5 100644
--- a/vendor/github.com/containers/storage/pkg/chrootarchive/archive.go
+++ b/vendor/github.com/containers/storage/pkg/chrootarchive/archive.go
@@ -4,7 +4,6 @@ import (
stdtar "archive/tar"
"fmt"
"io"
- "io/ioutil"
"os"
"path/filepath"
"sync"
@@ -31,7 +30,8 @@ func NewArchiverWithChown(tarIDMappings *idtools.IDMappings, chownOpts *idtools.
// Untar reads a stream of bytes from `archive`, parses it as a tar archive,
// and unpacks it into the directory at `dest`.
// The archive may be compressed with one of the following algorithms:
-// identity (uncompressed), gzip, bzip2, xz.
+//
+// identity (uncompressed), gzip, bzip2, xz.
func Untar(tarArchive io.Reader, dest string, options *archive.TarOptions) error {
return untarHandler(tarArchive, dest, options, true, dest)
}
@@ -82,7 +82,7 @@ func untarHandler(tarArchive io.Reader, dest string, options *archive.TarOptions
}
}
- r := ioutil.NopCloser(tarArchive)
+ r := io.NopCloser(tarArchive)
if decompress {
decompressedArchive, err := archive.DecompressStream(tarArchive)
if err != nil {