redo argv name

1 files changed, 20 insertions, 15 deletions

diff --git a/doPull.go b/doPull.go
index ca88e3a..7e74812 100644
--- a/doPull.go
+++ b/doPull.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"errors"
 	"time"
 
 	"go.wit.com/lib/cobol"
@@ -49,7 +50,9 @@ func needToUpdateRepo(repo *gitpb.Repo) (*gitpb.Repo, error) {
 }
 
 // is every repo on the devel branch?
-func doPull() error {
+func doPull() (string, error) {
+	var s string
+	var err error
 	if argv.Pull.Update != nil {
 		submit := me.forge.PrepareCheckRepos()
 		updatepb, regPB, err := submit.HttpPost(myServer(), "updateURL")
@@ -61,14 +64,14 @@ func doPull() error {
 		}
 		if updatepb == nil {
 			log.Info("server sent nil back")
-			return err
+			return "forge server error", err
 		}
-		log.Infof("pull update pb.Len()=%d\n", updatepb.Len())
-		return nil
+		s = log.Sprintf("pull update pb.Len()=%d\n", updatepb.Len())
+		return s, err
 	}
 	if argv.Pull.Check != nil {
-		err := doFixUrls()
-		return err
+		err = doFixUrls()
+		return "fixed urls", err
 	}
 	if argv.Pull.List != nil {
 		found := gitpb.NewRepos()
@@ -81,14 +84,14 @@ func doPull() error {
 			found.Append(me.forge.Repos.Repos[count])
 		}
 		found.SortNamespace()
-		me.forge.PrintPullTable(found)
-		return nil
+		footer := me.forge.PrintPullTable(found)
+		return footer, nil
 	}
 
 	// below this, you must not be in 'normal' mode
 	if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
-		log.Info("you must check out the devel or master branches")
-		return nil
+		s = "you must check out the devel or master branches"
+		return s, errors.New("wrong mode " + me.forge.GetMode())
 	}
 
 	if argv.Pull.Force || argv.Force {
@@ -117,12 +120,14 @@ func doPull() error {
 		}
 		repoerr.SortNamespace()
 		footer := me.forge.PrintPullTable(repoerr)
-		log.Info("git pull FAILED on these:", footer)
-		me.sh.GoodExit("git pull done")
+		if repoerr.Len() > 0 {
+			err = errors.New("git pull FAILED on these: " + footer)
+		}
+		s = "git pull done"
+	} else {
+		s = "need --force for git pull"
 	}
-
-	log.Info("do a pull check here?")
-	return nil
+	return s, err
 
 }