diff options
Diffstat (limited to 'doMerge.go')
| -rw-r--r-- | doMerge.go | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -150,7 +150,7 @@ func doMergeDevel() (*gitpb.Repos, error) { found := findMergeToDevel() for repo := range found.IterAll() { if _, err := repo.MergeToDevel(); err != nil { - log.Info("merge from user 2 failed", repo.GetGoPath(), err) + log.Info("merge from user 2 failed", repo.Namespace, err) // err := log.Errorf("merge from user failed") // log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stderr, "\n")) @@ -165,7 +165,7 @@ func doMergeDevel() (*gitpb.Repos, error) { } log.Infof("%s starting git merge\n", repo.FullPath) if repo.CheckoutDevel() { - log.Info("checkout devel failed", repo.GetGoPath()) + log.Info("checkout devel failed", repo.Namespace) err = log.Errorf("checkout devel failed") badExit(err) } @@ -175,7 +175,7 @@ func doMergeDevel() (*gitpb.Repos, error) { log.Info("MERGE HASHES TO DEVEL:", i, hash) } if _, err := repo.MergeToDevel(); err != nil { - log.Info("merge from user 1 failed", repo.GetGoPath(), err) + log.Info("merge from user 1 failed", repo.Namespace, err) err = log.Errorf("merge from user 1 failed") // log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stderr, "\n")) @@ -191,7 +191,7 @@ func doMergeDevel() (*gitpb.Repos, error) { /* func repoMergeToDevel(repo *gitpb.Repo) error { if _, err := repo.MergeToDevel(); err != nil { - log.Info("merge from user 3 failed", repo.GetGoPath(), err) + log.Info("merge from user 3 failed", repo.Namespace, err) // err := log.Errorf("merge from user failed") // log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stderr, "\n")) @@ -210,7 +210,7 @@ func doMergeMaster() (*gitpb.Repos, error) { found := findMergeToMaster() for repo := range found.IterAll() { if _, err := repo.MergeToMaster(); err != nil { - log.Info("merge from devel 1 failed", repo.GetGoPath(), err) + log.Info("merge from devel 1 failed", repo.Namespace, err) err = log.Errorf("merge from devel 1 failed") badExit(err) } |