From 6c5a8581257404b80e019e6f1ae4157994c06acc Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 8 Jan 2025 10:11:49 -0600 Subject: [PATCH] minor --- checkout.go | 2 +- config.go | 2 +- goDep.parseGoSum.go | 48 --------------------------------------------- 3 files changed, 2 insertions(+), 50 deletions(-) diff --git a/checkout.go b/checkout.go index b25f169..8e489a8 100644 --- a/checkout.go +++ b/checkout.go @@ -13,7 +13,7 @@ func (repo *Repo) CheckoutMaster() bool { func (repo *Repo) CheckoutDevel() bool { bName := repo.GetDevelBranchName() if repo.checkoutBranch(bName) { - repo.UserBranchName = bName + repo.DevelBranchName = bName return true // switch ok } diff --git a/config.go b/config.go index 9b38238..4d9cdb4 100644 --- a/config.go +++ b/config.go @@ -28,7 +28,7 @@ func (all *Repos) ConfigSave() error { log.Info("gitpb proto.Marshal() failed len", len(data), err) return err } - log.Info("gitpb.ConfigSave() repos.Marshal() worked len", len(data)) + log.Info("gitpb.ConfigSave() repos.Marshal() worked len", len(all.Repos), "repos") configWrite("repos.pb", data) return nil } diff --git a/goDep.parseGoSum.go b/goDep.parseGoSum.go index e99e61e..8a8e434 100644 --- a/goDep.parseGoSum.go +++ b/goDep.parseGoSum.go @@ -37,7 +37,6 @@ func (repo *Repo) ParseGoSum() bool { } scanner := bufio.NewScanner(gosum) - log.Info("gosum:", tmp) for scanner.Scan() { line := strings.TrimSpace(scanner.Text()) @@ -69,50 +68,3 @@ func (repo *Repo) ParseGoSum() bool { } return true } - -/* -// reads and parses the go.sum file -// is identical to the one above, change that -func (repo *Repo) UpdatePublished() (bool, error) { - // empty out what was there before - repo.Published = nil - tmp := filepath.Join(repo.FullPath, "go.sum") - gosum, err := os.Open(tmp) - if err != nil { - log.Warn("missing go.sum", repo.FullPath) - return false, err - } - defer gosum.Close() - - scanner := bufio.NewScanner(gosum) - log.Info("gosum:", tmp) - for scanner.Scan() { - line := strings.TrimSpace(scanner.Text()) - - parts := strings.Split(line, " ") - if len(parts) == 3 { - godep := strings.TrimSpace(parts[0]) - version := strings.TrimSpace(parts[1]) - if strings.HasSuffix(version, "/go.mod") { - version = strings.TrimSuffix(version, "/go.mod") - } - new1 := GoDep{ - GoPath: godep, - Version: version, - } - if repo.Published == nil { - repo.Published = new(GoDeps) - } - repo.Published.AppendUniqueGoPath(&new1) - } else { - return false, errors.New("go.sum parse error invalid: " + line) - } - } - - if err := scanner.Err(); err != nil { - repo.Published = nil - return false, err - } - return true, nil -} -*/