From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 13 Jan 2008 12:04:35 +0000 (-0000)
Subject: Fix the regexp with regard to detecting inter-revisions
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=29023644db72d0232cb0eba15a04b9111dc7e930;p=portage.git

Fix the regexp with regard to detecting inter-revisions

svn path=/main/branches/prefix/; revision=9204
---

diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index ba7ad24d3..ce631bed6 100644
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -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"]