From 852bc954fa63a623fb97f1cf196a663c5848657c Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Mon, 4 Apr 2011 00:04:44 +0300 Subject: Add beta and alpha RC comparison support. --- cnucnu/helper.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cnucnu/helper.py') diff --git a/cnucnu/helper.py b/cnucnu/helper.py index 5301c84..14ed28e 100644 --- a/cnucnu/helper.py +++ b/cnucnu/helper.py @@ -158,7 +158,7 @@ def upstream_cmp(v1, v2): # both are rc, higher rc is newer diff = cmp(rc1.lower(), rc2.lower()) if diff != 0: - # rc is newer than pre etc + # rc > pre > beta > alpha return diff if rcn1 and rcn2: # both have rc number @@ -183,8 +183,8 @@ def upstream_cmp(v1, v2): return 0 -__rc_ups_regex = re.compile("(.*?)(-?(rc|pre)([0-9]*))", re.I) -__rc_rel_regex = re.compile(r'0\.[0-9]+\.(rc|pre)([0-9]*)', re.I) +__rc_ups_regex = re.compile("(.*?)(-?(rc|pre|beta|alpha)([0-9]*))", re.I) +__rc_rel_regex = re.compile(r'0\.[0-9]+\.(rc|pre|beta|alpha)([0-9]*)', re.I) def split_rc(version): """ Split version into version and release candidate string + -- cgit