diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-28 10:12:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 10:12:55 -0400 |
| commit | 288ebec6e737c105fa0ef43412de4e0a8997feb9 (patch) | |
| tree | 57eb1b59866fd63b7618b885fcbfb1e614709cf4 /pkg/domain/infra/abi/terminal | |
| parent | 6ed9868a34a875359852a910c23248946de59d20 (diff) | |
| parent | a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a (diff) | |
| download | podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.tar.gz podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.tar.bz2 podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.zip | |
Merge pull request #6909 from rhatdan/podman
Switch all references to github.com/containers/libpod -> podman
Diffstat (limited to 'pkg/domain/infra/abi/terminal')
| -rw-r--r-- | pkg/domain/infra/abi/terminal/sigproxy_linux.go | 6 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/terminal/terminal.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/terminal/terminal_linux.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkg/domain/infra/abi/terminal/sigproxy_linux.go b/pkg/domain/infra/abi/terminal/sigproxy_linux.go index 973efbc0e..f484e926c 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_linux.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_linux.go @@ -4,8 +4,8 @@ import ( "os" "syscall" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/signal" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/signal" "github.com/sirupsen/logrus" ) @@ -22,7 +22,7 @@ func ProxySignals(ctr *libpod.Container) { // intended for the podman command itself. // SIGURG was added because of golang 1.14 and its preemptive changes // causing more signals to "show up". - // https://github.com/containers/libpod/issues/5483 + // https://github.com/containers/podman/issues/5483 if s == syscall.SIGCHLD || s == syscall.SIGPIPE || s == syscall.SIGURG { continue } diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go index bd78729e7..0b6e57f49 100644 --- a/pkg/domain/infra/abi/terminal/terminal.go +++ b/pkg/domain/infra/abi/terminal/terminal.go @@ -5,7 +5,7 @@ import ( "os" "os/signal" - lsignal "github.com/containers/libpod/v2/pkg/signal" + lsignal "github.com/containers/podman/v2/pkg/signal" "github.com/docker/docker/pkg/term" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/terminal/terminal_linux.go b/pkg/domain/infra/abi/terminal/terminal_linux.go index 5575c6d11..8886625a6 100644 --- a/pkg/domain/infra/abi/terminal/terminal_linux.go +++ b/pkg/domain/infra/abi/terminal/terminal_linux.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh/terminal" |