Skip to content

Commit

Permalink
Remove autoupdate flag in package-builder (#465)
Browse files Browse the repository at this point in the history
Remove autoupdate flag in package-builder. It's usage is implied by `update_channel`, no point to both.
  • Loading branch information
zwass authored and directionless committed Apr 19, 2019
1 parent ea189e2 commit 7350113
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
8 changes: 1 addition & 7 deletions cmd/package-builder/package-builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,10 @@ func runMake(args []string) error {
env.Bool("INSECURE_TRANSPORT", false),
"whether or not the launcher packages should invoke the launcher's --insecure_transport flag",
)
flAutoupdate = flagset.Bool(
"autoupdate",
env.Bool("AUTOUPDATE", false),
"whether or not the launcher packages should invoke the launcher's --autoupdate flag",
)
flUpdateChannel = flagset.String(
"update_channel",
env.String("UPDATE_CHANNEL", ""),
"the value that should be used when invoking the launcher's --update_channel flag",
"the value that should be used when invoking the launcher's --update_channel flag. Autoupdates will be disabled unless this is specified",
)
flControlHostname = flagset.String(
"control_hostname",
Expand Down Expand Up @@ -197,7 +192,6 @@ func runMake(args []string) error {
Transport: *flTransport,
Insecure: *flInsecure,
InsecureTransport: *flInsecureTransport,
Autoupdate: *flAutoupdate,
UpdateChannel: *flUpdateChannel,
InitialRunner: *flInitialRunner,
ControlHostname: *flControlHostname,
Expand Down
3 changes: 1 addition & 2 deletions pkg/packaging/packaging.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ type PackageOptions struct {
Transport string
Insecure bool
InsecureTransport bool
Autoupdate bool
UpdateChannel string
InitialRunner bool
ControlHostname string
Expand Down Expand Up @@ -117,7 +116,7 @@ func (p *PackageOptions) Build(ctx context.Context, packageWriter io.Writer, tar
launcherBoolFlags = append(launcherBoolFlags, "control")
}

if p.Autoupdate && p.UpdateChannel != "" {
if p.UpdateChannel != "" {
launcherBoolFlags = append(launcherBoolFlags, "autoupdate")
launcherMapFlags["update_channel"] = p.UpdateChannel
}
Expand Down

0 comments on commit 7350113

Please sign in to comment.