summaryrefslogtreecommitdiff
path: root/vendor/go.etcd.io/bbolt/tx.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-03 17:58:24 +0200
committerGitHub <noreply@github.com>2021-06-03 17:58:24 +0200
commitcbcf0a1dd7f9e87a837dae96ffb1b3d0ff8c5b91 (patch)
tree971ee453feb66298c773cd3975eae0715354866c /vendor/go.etcd.io/bbolt/tx.go
parent0f8ec8e366ce77c3309c560e471cc957851e1cf1 (diff)
parent735470ff234a319d2f02f634204bc74af77cc60e (diff)
downloadpodman-cbcf0a1dd7f9e87a837dae96ffb1b3d0ff8c5b91.tar.gz
podman-cbcf0a1dd7f9e87a837dae96ffb1b3d0ff8c5b91.tar.bz2
podman-cbcf0a1dd7f9e87a837dae96ffb1b3d0ff8c5b91.zip
Merge pull request #10545 from containers/dependabot/go_modules/go.etcd.io/bbolt-1.3.6
Bump go.etcd.io/bbolt from 1.3.5 to 1.3.6
Diffstat (limited to 'vendor/go.etcd.io/bbolt/tx.go')
-rw-r--r--vendor/go.etcd.io/bbolt/tx.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/vendor/go.etcd.io/bbolt/tx.go b/vendor/go.etcd.io/bbolt/tx.go
index 4b1a64a8b..869d41200 100644
--- a/vendor/go.etcd.io/bbolt/tx.go
+++ b/vendor/go.etcd.io/bbolt/tx.go
@@ -188,7 +188,6 @@ func (tx *Tx) Commit() error {
}
// If strict mode is enabled then perform a consistency check.
- // Only the first consistency error is reported in the panic.
if tx.db.StrictMode {
ch := tx.Check()
var errs []string
@@ -393,7 +392,7 @@ func (tx *Tx) CopyFile(path string, mode os.FileMode) error {
return err
}
- err = tx.Copy(f)
+ _, err = tx.WriteTo(f)
if err != nil {
_ = f.Close()
return err