diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2011-04-04 00:04:41 +0300 |
|---|---|---|
| committer | Till Maas <opensource@till.name> | 2011-04-14 17:22:58 +0200 |
| commit | 02a73ab3ec7bf131371fbb2a7eef192a8a5c23ad (patch) | |
| tree | e26ca7d4bd9744e751d2f46e181a9a74ba6fcdd6 | |
| parent | 4fe1d04ea38ca543932b9c33dc5b2ea4310aa480 (diff) | |
| download | cnucnu-02a73ab3ec7bf131371fbb2a7eef192a8a5c23ad.tar.gz cnucnu-02a73ab3ec7bf131371fbb2a7eef192a8a5c23ad.tar.xz cnucnu-02a73ab3ec7bf131371fbb2a7eef192a8a5c23ad.zip | |
Fix split_rc() with uppercase RC/PRE.
| -rw-r--r-- | cnucnu/helper.py | 4 | ||||
| -rwxr-xr-x | cnucnu/tests/helper_test.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/cnucnu/helper.py b/cnucnu/helper.py index 20be23f..fb1777b 100644 --- a/cnucnu/helper.py +++ b/cnucnu/helper.py @@ -168,8 +168,8 @@ def upstream_cmp(v1, v2): else: return diff -__rc_ups_regex = re.compile("([^-rp]*)(-?(([Rr][Cc]|[Pp][Rr][Ee])[0-9]?))?") -__rc_rel_regex = re.compile(r'0\.[0-9]*\.(([Rr][Cc]|[Pp][Rr][Ee])[0-9])') +__rc_ups_regex = re.compile("([^-rp]*)(-?((rc|pre)[0-9]?))?", re.I) +__rc_rel_regex = re.compile(r'0\.[0-9]*\.((rc|pre)[0-9])', re.I) def split_rc(version): """ Split version into version and release candidate string if possible diff --git a/cnucnu/tests/helper_test.py b/cnucnu/tests/helper_test.py index b925a12..d3e1634 100755 --- a/cnucnu/tests/helper_test.py +++ b/cnucnu/tests/helper_test.py @@ -41,7 +41,8 @@ class HelperTest(unittest.TestCase): self.assertEqual(split_rc("0"), ("0", "")) self.assertEqual(split_rc("1"), ("1", "")) self.assertEqual(split_rc("1.2pre"), ("1.2", "pre")) - + self.assertEqual(split_rc("4.0.0RC1"), ("4.0.0", "RC1")) + self.assertEqual(split_rc("4.0.0-PRE2"), ("4.0.0", "PRE2")) self.assertEqual(split_rc("4.0.0rc1"), ("4.0.0", "rc1")) def test_upstream_cmp_rc(self): @@ -107,6 +108,7 @@ class HelperTest(unittest.TestCase): def test_get_rc(self): self.assertEqual(get_rc("0.4.pre2.fc11"), "pre2") + self.assertEqual(get_rc("0.4.RC1.fc15"), "RC1") def test_cmp_upstream_repo(self): self.assertEqual(cmp_upstream_repo("0.1.0", ("0.1.0", "5.fc10")), 0) |