From 601fc2ce4fa888cdd0cc33c41f6eee7ca39f585c Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 16 May 2019 14:35:49 -0400 Subject: Revert "Add VarlinkCall.RequiresUpgrade() type and method" This reverts commit bd3154fcf6a48b37cfde5d9b1226900cd863c0d9. Commit in question may be breaking upstream CI. Signed-off-by: Matthew Heon --- pkg/varlinkapi/util.go | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'pkg/varlinkapi/util.go') diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go index a9f1e20a1..8716c963a 100644 --- a/pkg/varlinkapi/util.go +++ b/pkg/varlinkapi/util.go @@ -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 - } -} -- cgit v1.2.3-54-g00ecf