diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-03 22:12:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 22:12:33 +0200 |
| commit | 1f8c509fafb4ce41970c4f28ed55daec459c7520 (patch) | |
| tree | 65edb58d599b5d8fdbb3cb9d06bb47f9e14140ba /cmd | |
| parent | 986a277a962aef8d975996d494a4522299f6973b (diff) | |
| parent | 9263ed2ab1c87dd798a37ac260e3e81c00a59448 (diff) | |
| download | podman-1f8c509fafb4ce41970c4f28ed55daec459c7520.tar.gz podman-1f8c509fafb4ce41970c4f28ed55daec459c7520.tar.bz2 podman-1f8c509fafb4ce41970c4f28ed55daec459c7520.zip | |
Merge pull request #6478 from rhatdan/abisupport
Remove use of ABISupport buildtag
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/registry/config_abi.go | 2 | ||||
| -rw-r--r-- | cmd/podman/registry/config_tunnel.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/service_abi.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/service_unsupported.go | 14 |
4 files changed, 3 insertions, 17 deletions
diff --git a/cmd/podman/registry/config_abi.go b/cmd/podman/registry/config_abi.go index 55430e1bf..4a909c17e 100644 --- a/cmd/podman/registry/config_abi.go +++ b/cmd/podman/registry/config_abi.go @@ -1,4 +1,4 @@ -// +build ABISupport +// +build !remote package registry diff --git a/cmd/podman/registry/config_tunnel.go b/cmd/podman/registry/config_tunnel.go index 29e744dac..bb3da947e 100644 --- a/cmd/podman/registry/config_tunnel.go +++ b/cmd/podman/registry/config_tunnel.go @@ -1,4 +1,4 @@ -// +build !ABISupport +// +build remote package registry diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index 501650839..f5386c4f1 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -1,4 +1,4 @@ -// +build ABISupport,!remote +// +build linux,!remote package system diff --git a/cmd/podman/system/service_unsupported.go b/cmd/podman/system/service_unsupported.go deleted file mode 100644 index 82272c882..000000000 --- a/cmd/podman/system/service_unsupported.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build !ABISupport,!remote - -package system - -import ( - "errors" - - "github.com/containers/libpod/pkg/domain/entities" - "github.com/spf13/pflag" -) - -func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entities.PodmanConfig) error { - return errors.New("not supported") -} |