summaryrefslogtreecommitdiffstats
path: root/mgagnome
diff options
context:
space:
mode:
authorOlav Vitters <ovitters@mageia.org>2013-02-13 18:31:26 +0000
committerOlav Vitters <ovitters@mageia.org>2013-02-13 18:31:26 +0000
commit0a5fb02d1274c86e4057a595e14b6b9f6e3bd1cd (patch)
treea230b08ef6a06f562b5318307b755a823552026b /mgagnome
parentcb29b72786abc25da815b37098e097f1478308f0 (diff)
downloadmgagnome-0a5fb02d1274c86e4057a595e14b6b9f6e3bd1cd.tar
mgagnome-0a5fb02d1274c86e4057a595e14b6b9f6e3bd1cd.tar.gz
mgagnome-0a5fb02d1274c86e4057a595e14b6b9f6e3bd1cd.tar.bz2
mgagnome-0a5fb02d1274c86e4057a595e14b6b9f6e3bd1cd.tar.xz
mgagnome-0a5fb02d1274c86e4057a595e14b6b9f6e3bd1cd.zip
ensure module names are passed to get_majmin
Diffstat (limited to 'mgagnome')
-rwxr-xr-xmgagnome16
1 files changed, 9 insertions, 7 deletions
diff --git a/mgagnome b/mgagnome
index 6b19aee..bf58a75 100755
--- a/mgagnome
+++ b/mgagnome
@@ -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: