diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-02-24 21:52:38 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-02-24 22:39:19 +0100 |
| commit | 1e94c2964d517ca4840ff5fa7ae1fd76753642de (patch) | |
| tree | 4f4610ef55887e7fe5dff5294f494e94b859dc3b /cmd/podman/build.go | |
| parent | 44baab0a7011a87a2eaa795bc0058a13da6d1bc0 (diff) | |
| download | podman-1e94c2964d517ca4840ff5fa7ae1fd76753642de.tar.gz podman-1e94c2964d517ca4840ff5fa7ae1fd76753642de.tar.bz2 podman-1e94c2964d517ca4840ff5fa7ae1fd76753642de.zip | |
build: move initialization after SetXdgDirs
otherwise it triggers the config file initialization from
vendor/github.com/containers/common/pkg/config before the init() in
main.go can set correctly XDG_RUNTIME_DIR and DBUS_SESSION_BUS_ADDRESS
when they are missing.
commit 96de762eedd1470dfbe73cf424eea848589268d7 introduced the
regression.
Closes: https://github.com/containers/libpod/issues/5314
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman/build.go')
| -rw-r--r-- | cmd/podman/build.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index 12aedac37..fa4689211 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -53,13 +53,12 @@ var ( } ) -func init() { +func initBuild() { buildCommand.Command = _buildCommand buildCommand.SetHelpTemplate(HelpTemplate()) buildCommand.SetUsageTemplate(UsageTemplate()) flags := buildCommand.Flags() flags.SetInterspersed(true) - budFlags := buildahcli.GetBudFlags(&budFlagsValues) flag := budFlags.Lookup("pull") if err := flag.Value.Set("true"); err != nil { |