diff options
| author | baude <bbaude@redhat.com> | 2019-02-12 15:38:30 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-02-12 15:53:19 -0600 |
| commit | 2ea8cd1b4fc5778e0e0b9a83d86fca1f41e76235 (patch) | |
| tree | 34736460266576df75be40ec5fcb35739efc4ada | |
| parent | ee27c39f85507993c0a3dfe3c4dfab4c7b7e5e00 (diff) | |
| download | podman-2ea8cd1b4fc5778e0e0b9a83d86fca1f41e76235.tar.gz podman-2ea8cd1b4fc5778e0e0b9a83d86fca1f41e76235.tar.bz2 podman-2ea8cd1b4fc5778e0e0b9a83d86fca1f41e76235.zip | |
Only build varlink when buildtag is available
Correct mistake that broke things like dlv where we should only
try to add the varlink command to podman when the 'varlink' build
tag is present.
Signed-off-by: baude <bbaude@redhat.com>
| -rw-r--r-- | cmd/podman/commands.go | 5 | ||||
| -rw-r--r-- | cmd/podman/varlink_dummy.go | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go index 2c56d5dec..71eb35048 100644 --- a/cmd/podman/commands.go +++ b/cmd/podman/commands.go @@ -42,10 +42,13 @@ func getMainCommands() []*cobra.Command { _topCommand, _umountCommand, _unpauseCommand, - _varlinkCommand, volumeCommand.Command, _waitCommand, } + + if len(_varlinkCommand.Use) > 0 { + rootCommands = append(rootCommands, _varlinkCommand) + } return rootCommands } diff --git a/cmd/podman/varlink_dummy.go b/cmd/podman/varlink_dummy.go index 8d7a7e8ca..430511d72 100644 --- a/cmd/podman/varlink_dummy.go +++ b/cmd/podman/varlink_dummy.go @@ -2,8 +2,10 @@ package main -import ( - "github.com/containers/libpod/cmd/podman/cliconfig" -) +import "github.com/spf13/cobra" -var varlinkCommand *cliconfig.PodmanCommand +var ( + _varlinkCommand = &cobra.Command{ + Use: "", + } +) |