jcarr
/
gitpb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

duh. logic was backwards

This commit is contained in:
Jeff Carr 2025-01-05 18:42:12 -06:00
parent 754e60fffa
commit bbd34df599
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
currentVersions.go
View File

@ -289,15 +289,15 @@ func (repo *Repo) IncrementTargetRevision() bool {
// first try just going from the last tag
repo.incrementRevision(repo.GetLastTag())
if verifyNewerVersion(repo.GetMasterVersion(), repo.GetTargetVersion()) {
if !isNewerVersion(repo.GetMasterVersion(), repo.GetTargetVersion()) {
log.Info("master version() is higher than target version", repo.GetMasterVersion(), repo.GetTargetVersion())
repo.incrementRevision(repo.GetMasterVersion())
}
if verifyNewerVersion(repo.GetLastTag(), repo.GetTargetVersion()) {
if !isNewerVersion(repo.GetLastTag(), repo.GetTargetVersion()) {
log.Info("last tag versn() is higher than target version", repo.GetLastTag(), repo.GetTargetVersion())
return false
}
if verifyNewerVersion(repo.GetMasterVersion(), repo.GetTargetVersion()) {
if !isNewerVersion(repo.GetMasterVersion(), repo.GetTargetVersion()) {
log.Info("master version() is higher than target version", repo.GetMasterVersion(), repo.GetTargetVersion())
return false
}
@ -329,7 +329,7 @@ func (repo *Repo) incrementRevision(lasttag string) {
// A = major = 3
// B = minor = 1
// C = revision = 4
func verifyNewerVersion(oldver, newver string) bool {
func isNewerVersion(oldver, newver string) bool {
olda, oldb, oldc := splitVersion(oldver)
newa, newb, newc := splitVersion(newver)