diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-05 13:41:44 -0500 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-05 16:50:40 -0500 |
commit | ba89a058882f1027226943fe2ef614930ab60f8e (patch) | |
tree | d4ebfb820c474826c213e00a833222313efd4433 /vendor/gopkg.in/cheggaaa/pb.v1/pool_win.go | |
parent | 4e0c0ecbc383531cd1b38db9027583974a72070d (diff) | |
download | podman-ba89a058882f1027226943fe2ef614930ab60f8e.tar.gz podman-ba89a058882f1027226943fe2ef614930ab60f8e.tar.bz2 podman-ba89a058882f1027226943fe2ef614930ab60f8e.zip |
Vendor in latest containers/buildah code
This should improve the speed of podman build.
Has fixes from containres/image for parallell pull.
Also vendor containers/storage and containers/image
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/gopkg.in/cheggaaa/pb.v1/pool_win.go')
-rw-r--r-- | vendor/gopkg.in/cheggaaa/pb.v1/pool_win.go | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/vendor/gopkg.in/cheggaaa/pb.v1/pool_win.go b/vendor/gopkg.in/cheggaaa/pb.v1/pool_win.go index d7a5ace41..63598d378 100644 --- a/vendor/gopkg.in/cheggaaa/pb.v1/pool_win.go +++ b/vendor/gopkg.in/cheggaaa/pb.v1/pool_win.go @@ -8,13 +8,18 @@ import ( ) func (p *Pool) print(first bool) bool { + p.m.Lock() + defer p.m.Unlock() var out string if !first { coords, err := getCursorPos() if err != nil { log.Panic(err) } - coords.Y -= int16(len(p.bars)) + coords.Y -= int16(p.lastBarsCount) + if coords.Y < 0 { + coords.Y = 0 + } coords.X = 0 err = setCursorPos(coords) @@ -24,12 +29,17 @@ func (p *Pool) print(first bool) bool { } isFinished := true for _, bar := range p.bars { - if !bar.isFinish { + if !bar.IsFinished() { isFinished = false } bar.Update() out += fmt.Sprintf("\r%s\n", bar.String()) } - fmt.Print(out) + if p.Output != nil { + fmt.Fprint(p.Output, out) + } else { + fmt.Print(out) + } + p.lastBarsCount = len(p.bars) return isFinished } |