cleanup mode handlingv0.25.13

3 files changed, 4 insertions, 2 deletions

diff --git a/config.go b/config.go
index 8f53f71..79bfe0b 100644
--- a/config.go
+++ b/config.go
@@ -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()
diff --git a/doCheckout.go b/doCheckout.go
index 37b1519..0a8f045 100644
--- a/doCheckout.go
+++ b/doCheckout.go
@@ -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)
diff --git a/main.go b/main.go
index a1a887e..451fdba 100644
--- a/main.go
+++ b/main.go
@@ -73,7 +73,6 @@ func main() {
 	}
 
 	if argv.Checkout != nil {
-		setForgeMode(forgepb.ForgeMode_DEVEL)
 		if err := doCheckout(); err != nil {
 			badExit(err)
 		}