diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-31 11:15:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 11:15:58 -0400 |
| commit | 8ab84b437352bf2b3653fe92fbfa60a59b980a93 (patch) | |
| tree | 56f3ab5d4876f2a10d769af6100ac3f0daeb8bc5 /vendor | |
| parent | 7b75ddb70c89656f4be334d14fec90fc5e50b736 (diff) | |
| parent | 9f7bad7dac6caff3c920403e34084a295016a1c5 (diff) | |
| download | podman-8ab84b437352bf2b3653fe92fbfa60a59b980a93.tar.gz podman-8ab84b437352bf2b3653fe92fbfa60a59b980a93.tar.bz2 podman-8ab84b437352bf2b3653fe92fbfa60a59b980a93.zip | |
Merge pull request #11373 from mtrmac/mpb-replace
Use UNMERGED vbauerster/mpb PR to fix a pull deadlock
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/vbauerster/mpb/v7/bar.go | 4 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
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 |