diff options
| -rw-r--r-- | doIncoming.go | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/doIncoming.go b/doIncoming.go index b3ab324..58d9ba2 100644 --- a/doIncoming.go +++ b/doIncoming.go @@ -100,26 +100,51 @@ func compareVersions(newver string, curver string) (bool, error) { s := log.Sprintf("token on the railroad failed (%v) to curver (%v) err(%v)(%v)", newtok, curtok, err1, err2) return false, errors.New(s) } - // log.Printf("compare (%v) to (%v)\n", newtok, curtok) + // CHECK A + if newtok.a > curtok.a { + return true, nil + } if curtok.a > newtok.a { return false, errors.New(log.Sprintf("A.x.x lower (%v) to curver (%v)", newver, curver)) } + + // CHECK B + if newtok.b > curtok.b { + return true, nil + } if curtok.b > newtok.b { return false, errors.New(log.Sprintf("x.B.x lower (%v) to curver (%v)", newver, curver)) } + + // CHECK C + if newtok.c > curtok.c { + return true, nil + } if curtok.c > newtok.c { return false, errors.New(log.Sprintf("x.x.C lower (%v) to curver (%v)", newver, curver)) } + + // CHECK PATCH # + if newtok.pnum > curtok.pnum { + return true, nil + } if curtok.pnum > newtok.pnum { return false, errors.New(log.Sprintf("patch # lower (%v) to curver (%v)", newver, curver)) } + + // CHECK BUILD # + if newtok.bnum > curtok.bnum { + return true, nil + } if curtok.bnum > newtok.bnum { return false, errors.New(log.Sprintf("build # lower (%v) to curver (%v)", newver, curver)) } + + // CHECK IS EQUAL if curtok.bnum == newtok.bnum { - return false, errors.New(log.Sprintf("build is equal (%v) to curver (%v)", newver, curver)) + return false, errors.New(log.Sprintf("new is equal (%v) to curver (%v)", newver, curver)) } - return true, nil + return false, errors.New(log.Sprintf("compare should not have gotten here (%v) to curver (%v)", newver, curver)) } func moveToBad(packageName string, fullname string, err error) string { @@ -155,7 +180,8 @@ func checkAgainstNewest(fullname string, newest *zoopb.Packages) bool { } curversion := parts[1] if ok, err := compareVersions(version, curversion); ok { - log.Printf("IS NEW: %s err=(%v)\n", packageName, err) + // log.Printf("IS NEW: %s err=(%v)\n", packageName, err) + return true } else { // log.Printf("IS BAD: %s err=(%v)\n", packageName, err) badname := moveToBad(packageName, fullname, err) |