opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7177 from mheon/there_can_be_only_one

Browse Source 
Ensure libpod/define does not include libpod/image
This commit is contained in:
OpenShift Merge Robot
2020-08-01 09:14:53 -04:00
committed by GitHub
parent af2a1327d1 e3ced7217f
commit de460bf978
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libpod/define/errors.go
View File

@ -2,23 +2,20 @@ package define
import ( import (
"errors" "errors"
"github.com/containers/podman/v2/libpod/image"
"github.com/containers/podman/v2/utils"
) )
var ( var (
// ErrNoSuchCtr indicates the requested container does not exist // ErrNoSuchCtr indicates the requested container does not exist
ErrNoSuchCtr = image.ErrNoSuchCtr ErrNoSuchCtr = errors.New("no such container")
// ErrNoSuchPod indicates the requested pod does not exist // ErrNoSuchPod indicates the requested pod does not exist
ErrNoSuchPod = image.ErrNoSuchPod ErrNoSuchPod = errors.New("no such pod")
// ErrNoSuchImage indicates the requested image does not exist // ErrNoSuchImage indicates the requested image does not exist
ErrNoSuchImage = image.ErrNoSuchImage ErrNoSuchImage = errors.New("no such image")
// ErrNoSuchTag indicates the requested image tag does not exist // ErrNoSuchTag indicates the requested image tag does not exist
ErrNoSuchTag = image.ErrNoSuchTag ErrNoSuchTag = errors.New("no such tag")
// ErrNoSuchVolume indicates the requested volume does not exist // ErrNoSuchVolume indicates the requested volume does not exist
ErrNoSuchVolume = errors.New("no such volume") ErrNoSuchVolume = errors.New("no such volume")
@ -76,7 +73,7 @@ var (
// ErrDetach indicates that an attach session was manually detached by // ErrDetach indicates that an attach session was manually detached by
// the user. // the user.
ErrDetach = utils.ErrDetach ErrDetach = errors.New("detached from container")
// ErrWillDeadlock indicates that the requested operation will cause a // ErrWillDeadlock indicates that the requested operation will cause a
// deadlock. This is usually caused by upgrade issues, and is resolved // deadlock. This is usually caused by upgrade issues, and is resolved

11
libpod/image/errors.go
View File

@ -1,17 +1,16 @@
package image package image
import ( import (
"errors" "github.com/containers/podman/v2/libpod/define"
) )
// Copied directly from libpod errors to avoid circular imports
var ( var (
// ErrNoSuchCtr indicates the requested container does not exist // ErrNoSuchCtr indicates the requested container does not exist
ErrNoSuchCtr = errors.New("no such container") ErrNoSuchCtr = define.ErrNoSuchCtr
// ErrNoSuchPod indicates the requested pod does not exist // ErrNoSuchPod indicates the requested pod does not exist
ErrNoSuchPod = errors.New("no such pod") ErrNoSuchPod = define.ErrNoSuchPod
// ErrNoSuchImage indicates the requested image does not exist // ErrNoSuchImage indicates the requested image does not exist
ErrNoSuchImage = errors.New("no such image") ErrNoSuchImage = define.ErrNoSuchImage
// ErrNoSuchTag indicates the requested image tag does not exist // ErrNoSuchTag indicates the requested image tag does not exist
ErrNoSuchTag = errors.New("no such tag") ErrNoSuchTag = define.ErrNoSuchTag
) )

3
utils/utils.go
View File

@ -9,6 +9,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/containers/podman/v2/libpod/define"
"github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/archive"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -51,7 +52,7 @@ func ExecCmdWithStdStreams(stdin io.Reader, stdout, stderr io.Writer, env []stri
// ErrDetach is an error indicating that the user manually detached from the // ErrDetach is an error indicating that the user manually detached from the
// container. // container.
var ErrDetach = errors.New("detached from container") var ErrDetach = define.ErrDetach
// CopyDetachable is similar to io.Copy but support a detach key sequence to break out. // CopyDetachable is similar to io.Copy but support a detach key sequence to break out.
func CopyDetachable(dst io.Writer, src io.Reader, keys []byte) (written int64, err error) { func CopyDetachable(dst io.Writer, src io.Reader, keys []byte) (written int64, err error) {