From c069d117594d72159157aa48d0693d8571be45c5 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Thu, 21 Feb 2019 11:54:04 +0100
Subject: vendor containers/image v1.4

This requires some additional changes to the dependencies since the
progress-bar library has been changed to github.com/vbauerster/mpb.

Please refer to the following link for the release notes:
https://github.com/containers/image/releases/tag/v1.4

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 vendor/gopkg.in/cheggaaa/pb.v1/pb_x.go | 118 ---------------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 vendor/gopkg.in/cheggaaa/pb.v1/pb_x.go

(limited to 'vendor/gopkg.in/cheggaaa/pb.v1/pb_x.go')

diff --git a/vendor/gopkg.in/cheggaaa/pb.v1/pb_x.go b/vendor/gopkg.in/cheggaaa/pb.v1/pb_x.go
deleted file mode 100644
index af4251760..000000000
--- a/vendor/gopkg.in/cheggaaa/pb.v1/pb_x.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// +build linux darwin freebsd netbsd openbsd solaris dragonfly
-// +build !appengine !js
-
-package pb
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-
-	"golang.org/x/sys/unix"
-)
-
-var ErrPoolWasStarted = errors.New("Bar pool was started")
-
-var (
-	echoLockMutex    sync.Mutex
-	origTermStatePtr *unix.Termios
-	tty              *os.File
-	istty            bool
-)
-
-func init() {
-	echoLockMutex.Lock()
-	defer echoLockMutex.Unlock()
-
-	var err error
-	tty, err = os.Open("/dev/tty")
-	istty = true
-	if err != nil {
-		tty = os.Stdin
-		istty = false
-	}
-}
-
-// terminalWidth returns width of the terminal.
-func terminalWidth() (int, error) {
-	if !istty {
-		return 0, errors.New("Not Supported")
-	}
-	echoLockMutex.Lock()
-	defer echoLockMutex.Unlock()
-
-	fd := int(tty.Fd())
-
-	ws, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ)
-	if err != nil {
-		return 0, err
-	}
-
-	return int(ws.Col), nil
-}
-
-func lockEcho() (shutdownCh chan struct{}, err error) {
-	echoLockMutex.Lock()
-	defer echoLockMutex.Unlock()
-	if istty {
-		if origTermStatePtr != nil {
-			return shutdownCh, ErrPoolWasStarted
-		}
-
-		fd := int(tty.Fd())
-
-		origTermStatePtr, err = unix.IoctlGetTermios(fd, ioctlReadTermios)
-		if err != nil {
-			return nil, fmt.Errorf("Can't get terminal settings: %v", err)
-		}
-
-		oldTermios := *origTermStatePtr
-		newTermios := oldTermios
-		newTermios.Lflag &^= syscall.ECHO
-		newTermios.Lflag |= syscall.ICANON | syscall.ISIG
-		newTermios.Iflag |= syscall.ICRNL
-		if err := unix.IoctlSetTermios(fd, ioctlWriteTermios, &newTermios); err != nil {
-			return nil, fmt.Errorf("Can't set terminal settings: %v", err)
-		}
-
-	}
-	shutdownCh = make(chan struct{})
-	go catchTerminate(shutdownCh)
-	return
-}
-
-func unlockEcho() error {
-	echoLockMutex.Lock()
-	defer echoLockMutex.Unlock()
-	if istty {
-		if origTermStatePtr == nil {
-			return nil
-		}
-
-		fd := int(tty.Fd())
-
-		if err := unix.IoctlSetTermios(fd, ioctlWriteTermios, origTermStatePtr); err != nil {
-			return fmt.Errorf("Can't set terminal settings: %v", err)
-		}
-
-	}
-	origTermStatePtr = nil
-
-	return nil
-}
-
-// listen exit signals and restore terminal state
-func catchTerminate(shutdownCh chan struct{}) {
-	sig := make(chan os.Signal, 1)
-	signal.Notify(sig, os.Interrupt, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGKILL)
-	defer signal.Stop(sig)
-	select {
-	case <-shutdownCh:
-		unlockEcho()
-	case <-sig:
-		unlockEcho()
-	}
-}
-- 
cgit v1.2.3-54-g00ecf