cleanup mode handling
This commit is contained in:
parent
17a62eb8da
commit
3a967eac13
|
@ -8,6 +8,7 @@ import (
|
|||
|
||||
"go.wit.com/lib/config"
|
||||
"go.wit.com/lib/protobuf/forgepb"
|
||||
"go.wit.com/log"
|
||||
)
|
||||
|
||||
func forgeConfigSave() error {
|
||||
|
@ -18,6 +19,7 @@ func setForgeMode(fmode forgepb.ForgeMode) {
|
|||
if me.forge.Config.Mode == fmode {
|
||||
return
|
||||
}
|
||||
log.Info("changing mode", me.forge.Config.Mode, fmode)
|
||||
me.forge.Config.Mode = fmode
|
||||
config.SetChanged("forge", true)
|
||||
me.forge.Config.ConfigSave()
|
||||
|
|
|
@ -27,6 +27,7 @@ func doCheckout() error {
|
|||
}
|
||||
|
||||
if argv.Checkout.Devel != nil {
|
||||
// setForgeMode(forgepb.ForgeMode_DEVEL)
|
||||
if err := me.forge.DoAllCheckoutDevelNew(argv.Force); err != nil {
|
||||
badExit(err)
|
||||
}
|
||||
|
@ -34,7 +35,7 @@ func doCheckout() error {
|
|||
}
|
||||
|
||||
if argv.Checkout.Master != nil {
|
||||
setForgeMode(forgepb.ForgeMode_CLEAN) // disable "normal" mode if set
|
||||
setForgeMode(forgepb.ForgeMode_MASTER) // disable "normal" mode if set
|
||||
|
||||
if err := me.forge.DoAllCheckoutMaster(); err != nil {
|
||||
badExit(err)
|
||||
|
|
Loading…
Reference in New Issue