[gentoo-commits] gentoo-x86 commit in app-portage/gentoolkit/files: 0.3.0_rc11-cpv.py.patch

[gentoo-commits] gentoo-x86 commit in app-portage/gentoolkit/files: 0.3.0_rc11-cpv.py.patch

[Paul Varner (fuzzyray)]

fuzzyray    10/11/22 20:22:33

  Added:                0.3.0_rc11-cpv.py.patch
  Log:
  Revision bump: Fix cpv.py to handle prefix ebuild inter-revisions. Bug 313295
  
  (Portage version: 2.1.9.24/cvs/Linux i686)

Revision  Changes    Path
1.1                  app-portage/gentoolkit/files/0.3.0_rc11-cpv.py.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0_rc11-cpv.py.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0_rc11-cpv.py.patch?rev=1.1&content-type=text/plain

Index: 0.3.0_rc11-cpv.py.patch
===================================================================
Index: pym/gentoolkit/cpv.py
===================================================================
--- pym/gentoolkit/cpv.py	(revision 864)
+++ pym/gentoolkit/cpv.py	(working copy)
@@ -34,6 +34,8 @@
 	"(?:_(p(?:re)?|beta|alpha|rc)\\d*)*$")
 isvalid_cat_re = re.compile("^(?:[a-zA-Z0-9][-a-zA-Z0-9+._]*(?:/(?!$))?)+$")
 _pkg_re = re.compile("^[a-zA-Z0-9+_]+$")
+# Prefix specific revision is of the form -r0<digit>+.<digit>+
+isvalid_rev_re = re.compile(r'(\d+|0\d+\.\d+)')
 
 # =======
 # Classes
@@ -249,6 +251,6 @@
 
 
 def isvalid_rev(s):
-	return s and s[0] == 'r' and s[1:] != '0' and s[1:].isdigit() 
+	return s and s[0] == 'r' and isvalid_rev_re.match(s[1:])
 
 # vim: set ts=4 sw=4 tw=79: