jcarr
/
submit-patchset
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closer to a new release

This commit is contained in:
Jeff Carr 2024-02-16 21:20:13 -06:00
parent 63a79121e3
commit 67afbba6f0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repolist.go
View File

@ -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
}