diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-16 22:59:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 22:59:58 +0200 |
| commit | e2cd3d2eec0124ffe2097cfbe40f5956e1e7b5ca (patch) | |
| tree | dc80e1320d2aa8eeb95915c327435b7f324d7623 /pkg/varlinkapi/util.go | |
| parent | 8161802f7df857e0850f842261079c83290f9891 (diff) | |
| parent | 601fc2ce4fa888cdd0cc33c41f6eee7ca39f585c (diff) | |
| download | podman-e2cd3d2eec0124ffe2097cfbe40f5956e1e7b5ca.tar.gz podman-e2cd3d2eec0124ffe2097cfbe40f5956e1e7b5ca.tar.bz2 podman-e2cd3d2eec0124ffe2097cfbe40f5956e1e7b5ca.zip | |
Merge pull request #3141 from mheon/revert_3090
Revert "Add VarlinkCall.RequiresUpgrade() type and method"
Diffstat (limited to 'pkg/varlinkapi/util.go')
| -rw-r--r-- | pkg/varlinkapi/util.go | 15 |
1 files changed, 0 insertions, 15 deletions
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 - } -} |