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

Revert "Add VarlinkCall.RequiresUpgrade() type and method"

Browse Source 
This reverts commit bd3154fcf6a48b37cfde5d9b1226900cd863c0d9.

Commit in question may be breaking upstream CI.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2019-05-16 14:35:49 -04:00
parent 8161802f7d
commit 601fc2ce4f
4 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/varlinkapi/util.go
View File

@ -13,11 +13,6 @@ import (
"github.com/containers/libpod/cmd/podman/varlink"
"github.com/containers/libpod/libpod"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
)
var (
ErrUpgradedConnectionRequired = errors.New("peer must use upgraded connection for operation")
)
// getContext returns a non-nil, empty context
@ -200,13 +195,3 @@ func makePsOpts(inOpts iopodman.PsOpts) shared.PsOptions {
Sync: derefBool(inOpts.Sync),
}
}
// RequiresUpgrade tests if varlink connection has been marked for upgrade.
func (v *VarlinkCall) RequiresUpgrade() error {
if v.WantsUpgrade() {
// A nil is sent to the peer as required by the varlink protocol.
return v.Reply(nil)
} else {
return ErrUpgradedConnectionRequired
}
}