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

Merge pull request #2323 from baude/varlinkconditional

Browse Source 
Only build varlink when buildtag is available
This commit is contained in:
OpenShift Merge Robot
2019-02-13 07:19:48 +01:00
committed by GitHub
parent ee27c39f85 2ea8cd1b4f
commit 037107bc84
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/commands.go
View File

@ -42,10 +42,13 @@ func getMainCommands() []*cobra.Command {
_topCommand, _topCommand,
_umountCommand, _umountCommand,
_unpauseCommand, _unpauseCommand,
_varlinkCommand,
volumeCommand.Command, volumeCommand.Command,
_waitCommand, _waitCommand,
} }
if len(_varlinkCommand.Use) > 0 {
rootCommands = append(rootCommands, _varlinkCommand)
}
return rootCommands return rootCommands
} }

10
cmd/podman/varlink_dummy.go
View File

@ -2,8 +2,10 @@
package main package main
import ( import "github.com/spf13/cobra"
"github.com/containers/libpod/cmd/podman/cliconfig"
)
var varlinkCommand *cliconfig.PodmanCommand var (
_varlinkCommand = &cobra.Command{
Use: "",
}
)