From 67afbba6f0efd4e53c742788cee85af2290fcac0 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 16 Feb 2024 21:20:13 -0600 Subject: [PATCH] closer to a new release --- repolist.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/repolist.go b/repolist.go index 5d198c7..16ec452 100644 --- a/repolist.go +++ b/repolist.go @@ -215,9 +215,10 @@ func mergeAllDevelToMain() bool { } log.Info("found", repo.String(), repo.dirtyLabel.String()) repo.newScan() - if repo.status.RunDevelMergeB() { + if repo.status.MergeUserToDevel() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { + log.Warn("last repo:", repo.status.Path()) log.Warn("THINGS FAILED fullAutomation() returned false") return false } @@ -244,9 +245,10 @@ func mergeAllUserToDevel() bool { } log.Info("found", repo.String(), repo.dirtyLabel.String()) repo.newScan() - if repo.status.RunDevelMergeB() { + if repo.status.MergeUserToDevel() { log.Warn("THINGS SEEM OK fullAutomation() returned true.") } else { + log.Warn("last repo:", repo.status.Path()) log.Warn("THINGS FAILED fullAutomation() returned false") return false }