diff options
-rwxr-xr-x | mgagnome | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -109,16 +109,18 @@ def get_majmin(version, module=None): return (nrs[0], nrs[1]) -def get_safe_max_version(version): +def get_safe_max_version(version, module=None): if not re_majmin.match(version): return None - majmin_nr = map(long, re_majmin.sub(r'\1', version).split('.')) + majmin = get_majmin(version, module) - if majmin_nr[1] % 2 == 0: - return "%d.%d" % (majmin_nr[0], majmin_nr[1] + 1) + min_nr = long(majmin[1]) + + if min_nr % 2 == 0: + return "%s.%d" % (majmin[0], min_nr + 1) else: - return "%d.%d" % (majmin_nr[0], majmin_nr[1] + 2) + return "%s.%d" % (majmin[0], min_nr + 2) def judge_version_increase(version_old, version_new, module=None): """Judge quality of version increase: @@ -302,7 +304,7 @@ class SpecFile(object): """Update specfile (increase version)""" cur_version = self.version - (judgement, msg) = judge_version_increase(cur_version, version) + (judgement, msg) = judge_version_increase(cur_version, version, self.module) if judgement < 0: print >>sys.stderr, "ERROR: %s!" % (msg) @@ -773,7 +775,7 @@ def cmd_check_latest(options, parser): sys.stdout.write(package) sys.stdout.write("\t%s\t%s" % (spec_version, package_version)) - safe_max_version = get_safe_max_version(spec_version) + safe_max_version = get_safe_max_version(spec_version, module=module) versions = Upstream.versions(module) if versions: |