summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2021-08-31 15:17:45 +0200
committerMiloslav Trmač <mitr@redhat.com>2021-08-31 15:51:36 +0200
commit9f7bad7dac6caff3c920403e34084a295016a1c5 (patch)
treeffe1733bd2802438b3c18a0a73e17af514351259 /vendor
parent83de22e892bf0d8efd29a73df462789e2b1418f3 (diff)
downloadpodman-9f7bad7dac6caff3c920403e34084a295016a1c5.tar.gz
podman-9f7bad7dac6caff3c920403e34084a295016a1c5.tar.bz2
podman-9f7bad7dac6caff3c920403e34084a295016a1c5.zip
Use UNMERGED vbauerster/mpb PR to fix a pull deadlock
> go mod edit -replace github.com/vbauerster/mpb/v7=github.com/mtrmac/mpb/v7@abort-deadlock > make vendor See https://github.com/vbauerster/mpb/issues/100 and https://github.com/vbauerster/mpb/pull/101 . Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/vbauerster/mpb/v7/bar.go4
-rw-r--r--vendor/modules.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/vendor/github.com/vbauerster/mpb/v7/bar.go b/vendor/github.com/vbauerster/mpb/v7/bar.go
index ca191cf39..95d4439f8 100644
--- a/vendor/github.com/vbauerster/mpb/v7/bar.go
+++ b/vendor/github.com/vbauerster/mpb/v7/bar.go
@@ -268,13 +268,15 @@ func (b *Bar) SetPriority(priority int) {
// if bar is already in complete state. If drop is true bar will be
// removed as well.
func (b *Bar) Abort(drop bool) {
+ if drop {
+ b.container.dropBar(b) // It is safe to call this multiple times with the same bar
+ }
select {
case b.operateState <- func(s *bState) {
if s.completed == true {
return
}
if drop {
- b.container.dropBar(b)
b.cancel()
return
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 5eb059dcd..3666ff40b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -612,7 +612,7 @@ github.com/vbauerster/mpb/v6
github.com/vbauerster/mpb/v6/cwriter
github.com/vbauerster/mpb/v6/decor
github.com/vbauerster/mpb/v6/internal
-# github.com/vbauerster/mpb/v7 v7.1.3
+# github.com/vbauerster/mpb/v7 v7.1.3 => github.com/mtrmac/mpb/v7 v7.0.5-0.20210831125917-6bcc64f93d02
github.com/vbauerster/mpb/v7
github.com/vbauerster/mpb/v7/cwriter
github.com/vbauerster/mpb/v7/decor