summaryrefslogtreecommitdiff
path: root/pkg/util
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-28 10:12:55 -0400
committerGitHub <noreply@github.com>2020-07-28 10:12:55 -0400
commit288ebec6e737c105fa0ef43412de4e0a8997feb9 (patch)
tree57eb1b59866fd63b7618b885fcbfb1e614709cf4 /pkg/util
parent6ed9868a34a875359852a910c23248946de59d20 (diff)
parenta5e37ad2805b2594339e0d5d41da0e0cc37e4f4a (diff)
downloadpodman-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/util')
-rw-r--r--pkg/util/utils.go8
-rw-r--r--pkg/util/utils_linux.go2
-rw-r--r--pkg/util/utils_supported.go2
3 files changed, 6 insertions, 6 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 9eeb116c0..82282a549 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -15,10 +15,10 @@ import (
"github.com/BurntSushi/toml"
"github.com/containers/common/pkg/config"
"github.com/containers/image/v5/types"
- "github.com/containers/libpod/v2/pkg/errorhandling"
- "github.com/containers/libpod/v2/pkg/namespaces"
- "github.com/containers/libpod/v2/pkg/rootless"
- "github.com/containers/libpod/v2/pkg/signal"
+ "github.com/containers/podman/v2/pkg/errorhandling"
+ "github.com/containers/podman/v2/pkg/namespaces"
+ "github.com/containers/podman/v2/pkg/rootless"
+ "github.com/containers/podman/v2/pkg/signal"
"github.com/containers/storage"
"github.com/containers/storage/pkg/idtools"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go
index d4c2644b3..29b16f765 100644
--- a/pkg/util/utils_linux.go
+++ b/pkg/util/utils_linux.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
"syscall"
- "github.com/containers/libpod/v2/pkg/rootless"
+ "github.com/containers/podman/v2/pkg/rootless"
"github.com/containers/psgo"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go
index 82bfdb3ec..bf59240c6 100644
--- a/pkg/util/utils_supported.go
+++ b/pkg/util/utils_supported.go
@@ -11,7 +11,7 @@ import (
"path/filepath"
"syscall"
- "github.com/containers/libpod/v2/pkg/rootless"
+ "github.com/containers/podman/v2/pkg/rootless"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)