Fix the regexp with regard to detecting inter-revisions
authorFabian Groffen <grobian@gentoo.org>
Sun, 13 Jan 2008 12:04:35 +0000 (12:04 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sun, 13 Jan 2008 12:04:35 +0000 (12:04 -0000)
svn path=/main/branches/prefix/; revision=9204

pym/portage/versions.py

index ba7ad24d3aba312cf827c5eb0b8a8c19e3f0f8dc..ce631bed647d609a8d6ecc8a81a4454e7690b2c3 100644 (file)
@@ -6,7 +6,7 @@
 import re
 
 # PREFIX hack: -r(\\d+) -> -r(\\d+|0\\d+\\.\\d+) (see below)
-ver_regexp = re.compile("^(cvs\\.)?(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+|0\\.\\d+))?$")
+ver_regexp = re.compile("^(cvs\\.)?(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+|0\\d+\\.\\d+))?$")
 suffix_regexp = re.compile("^(alpha|beta|rc|pre|p)(\\d*)$")
 suffix_value = {"pre": -2, "p": 0, "alpha": -4, "beta": -3, "rc": -1}
 endversion_keys = ["pre", "p", "alpha", "beta", "rc"]