duh. logic was backwards
This commit is contained in:
parent
754e60fffa
commit
bbd34df599
|
@ -289,15 +289,15 @@ func (repo *Repo) IncrementTargetRevision() bool {
|
||||||
// first try just going from the last tag
|
// first try just going from the last tag
|
||||||
repo.incrementRevision(repo.GetLastTag())
|
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())
|
log.Info("master version() is higher than target version", repo.GetMasterVersion(), repo.GetTargetVersion())
|
||||||
repo.incrementRevision(repo.GetMasterVersion())
|
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())
|
log.Info("last tag versn() is higher than target version", repo.GetLastTag(), repo.GetTargetVersion())
|
||||||
return false
|
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())
|
log.Info("master version() is higher than target version", repo.GetMasterVersion(), repo.GetTargetVersion())
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -329,7 +329,7 @@ func (repo *Repo) incrementRevision(lasttag string) {
|
||||||
// A = major = 3
|
// A = major = 3
|
||||||
// B = minor = 1
|
// B = minor = 1
|
||||||
// C = revision = 4
|
// C = revision = 4
|
||||||
func verifyNewerVersion(oldver, newver string) bool {
|
func isNewerVersion(oldver, newver string) bool {
|
||||||
olda, oldb, oldc := splitVersion(oldver)
|
olda, oldb, oldc := splitVersion(oldver)
|
||||||
newa, newb, newc := splitVersion(newver)
|
newa, newb, newc := splitVersion(newver)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue