diff options
| author | Till Maas <opensource@till.name> | 2012-02-08 22:14:37 +0100 |
|---|---|---|
| committer | Till Maas <opensource@till.name> | 2012-02-08 22:14:37 +0100 |
| commit | 7a9aa0f957440eb7f533f233b1c9c3349376fa54 (patch) | |
| tree | e9524f9e756bdec30cdbd7e03895ab77488f236f | |
| parent | b8441f985c82f61b04d633dc221e8d4166d18bc1 (diff) | |
| download | cnucnu-7a9aa0f957440eb7f533f233b1c9c3349376fa54.tar.gz cnucnu-7a9aa0f957440eb7f533f233b1c9c3349376fa54.tar.xz cnucnu-7a9aa0f957440eb7f533f233b1c9c3349376fa54.zip | |
Support 'dev' release candidate style, Red Hat Bug Report https://bugzilla.redhat.com/show_bug.cgi?id=788702
| -rw-r--r-- | cnucnu/helper.py | 4 | ||||
| -rwxr-xr-x | cnucnu/tests/helper_test.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cnucnu/helper.py b/cnucnu/helper.py index 8d02ffb..7134908 100644 --- a/cnucnu/helper.py +++ b/cnucnu/helper.py @@ -183,8 +183,8 @@ def upstream_cmp(v1, v2): return 0 -__rc_upstream_regex = re.compile("(.*?)(-?(rc|pre|beta|alpha)([0-9]*))", re.I) -__rc_release_regex = re.compile(r'0\.[0-9]+\.(rc|pre|beta|alpha)([0-9]*)', re.I) +__rc_upstream_regex = re.compile("(.*?)\.?(-?(rc|pre|beta|alpha|dev)([0-9]*))", re.I) +__rc_release_regex = re.compile(r'0\.[0-9]+\.(rc|pre|beta|alpha|dev)([0-9]*)', re.I) def split_rc(version): """ Split (upstream) version into version and release candidate string + diff --git a/cnucnu/tests/helper_test.py b/cnucnu/tests/helper_test.py index 4e3f525..bd355b9 100755 --- a/cnucnu/tests/helper_test.py +++ b/cnucnu/tests/helper_test.py @@ -47,6 +47,7 @@ class HelperTest(unittest.TestCase): self.assertEqual(split_rc("0.1-beta3"), ("0.1", "beta", "3")) self.assertEqual(split_rc("20110404beta0"), ("20110404", "beta", "0")) self.assertEqual(split_rc("123alpha05"), ("123", "alpha", "05")) + self.assertEqual(split_rc("1.4.7.dev3"), ("1.4.7", "dev", "3")) def test_upstream_cmp_rc(self): self.assertEqual(upstream_cmp("4.0.0", "4.0.0"), 0) @@ -68,6 +69,7 @@ class HelperTest(unittest.TestCase): self.assertEqual(upstream_cmp("1.0.0", "1.0.0-rc1"), 1) self.assertEqual(upstream_cmp("1.0.0rc3", "1.0.0-RC21"), -1) self.assertEqual(upstream_cmp("1.0.0rc10", "1.0.0-rc0010"), 0) + self.assertEqual(upstream_cmp("1.4.7", "1.4.7.dev3"), 1) def test_upstream_cmp_pre(self): self.assertEqual(upstream_cmp("4.0.0", "4.0.0"), 0) |