diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-09 21:58:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 21:58:53 +0200 |
| commit | bb80586e275fe0d3f47700ec54c9718a28b1e59c (patch) | |
| tree | 90a74c6b90ce1cd01ec0fac1b5d1bab1d886e00f /vendor | |
| parent | d05798e5e8efcb1acdd8794edfa0f82bf5f01045 (diff) | |
| parent | 2e804006831fb017b6b392d9aab0838a2fac236d (diff) | |
| download | podman-bb80586e275fe0d3f47700ec54c9718a28b1e59c.tar.gz podman-bb80586e275fe0d3f47700ec54c9718a28b1e59c.tar.bz2 podman-bb80586e275fe0d3f47700ec54c9718a28b1e59c.zip | |
Merge pull request #3775 from vrothberg/update-storage
vendor github.com/containers/storage@v1.13.2
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/storage/VERSION | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/storage/drivers/btrfs/btrfs.go | 10 | ||||
| -rw-r--r-- | vendor/github.com/containers/storage/drivers/windows/windows.go | 10 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/vendor/github.com/containers/storage/VERSION b/vendor/github.com/containers/storage/VERSION index b50dd27dd..065f9ec4c 100644 --- a/vendor/github.com/containers/storage/VERSION +++ b/vendor/github.com/containers/storage/VERSION @@ -1 +1 @@ -1.13.1 +1.13.3-dev diff --git a/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go b/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go index 30264ef4a..1f719fa85 100644 --- a/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go +++ b/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go @@ -645,7 +645,15 @@ func (d *Driver) Get(id string, options graphdriver.MountOpts) (string, error) { if err != nil { return "", err } - if len(options.Options) > 0 { + switch len(options.Options) { + case 0: + case 1: + if options.Options[0] == "ro" { + // ignore "ro" option + break + } + fallthrough + default: return "", fmt.Errorf("btrfs driver does not support mount options") } diff --git a/vendor/github.com/containers/storage/drivers/windows/windows.go b/vendor/github.com/containers/storage/drivers/windows/windows.go index 11f1c98b1..c1ab93e1d 100644 --- a/vendor/github.com/containers/storage/drivers/windows/windows.go +++ b/vendor/github.com/containers/storage/drivers/windows/windows.go @@ -372,7 +372,15 @@ func (d *Driver) Get(id string, options graphdriver.MountOpts) (string, error) { logrus.Debugf("WindowsGraphDriver Get() id %s mountLabel %s", id, options.MountLabel) var dir string - if len(options.Options) > 0 { + switch len(options.Options) { + case 0: + case 1: + if options.Options[0] == "ro" { + // ignore "ro" option + break + } + fallthrough + default: return "", fmt.Errorf("windows driver does not support mount options") } rID, err := d.resolveID(id) diff --git a/vendor/modules.txt b/vendor/modules.txt index 2726a53a9..efb7d99da 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -103,7 +103,7 @@ github.com/containers/psgo/internal/dev github.com/containers/psgo/internal/proc github.com/containers/psgo/internal/process github.com/containers/psgo/internal/host -# github.com/containers/storage v1.13.1 +# github.com/containers/storage v1.13.2 github.com/containers/storage github.com/containers/storage/pkg/archive github.com/containers/storage/pkg/chrootarchive |