From: fuzzyray <fuzzyray@gentoo.org>
Date: Thu, 7 May 2009 22:01:50 +0000 (-0000)
Subject: Add patch from Robert Buchholz:
X-Git-Tag: gentoolkit-0.3.0_rc6~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff678ad5fdd58e87ae1d136588162eafa7371830;p=gentoolkit.git

Add patch from Robert Buchholz:

Backport SLOT support from Portage 2.2 glsa.py

In particular, this is a port of these commits:
commit 856616597ee791efa42dd59760db8e50e72efffd
Author: zmedico <zmedico@ac592a22-f3fe-0310-977e-98394eae9e84>
Date:   Wed Oct 8 22:35:31 2008 +0000

    Fix apparent breakage from r11593 (slot dep support):
    * Handle KeyError from element.getAttribute() in makeAtom() and
    * makeVersion().
    * Avoid 'sre_constants.error: unmatched group' exceptions in
    * revisionMatch()
      when the atom does not have a slot.


svn path=/trunk/gentoolkit/; revision=629
---

diff --git a/pym/gentoolkit/glsa/__init__.py b/pym/gentoolkit/glsa/__init__.py
index 86a6dd3..313c1f4 100644
--- a/pym/gentoolkit/glsa/__init__.py
+++ b/pym/gentoolkit/glsa/__init__.py
@@ -273,6 +273,13 @@ def makeAtom(pkgname, versionNode):
 	rValue = opMapping[versionNode.getAttribute("range")] \
 				+ pkgname \
 				+ "-" + getText(versionNode, format="strip")
+	try:
+		slot = versionNode.getAttribute("slot").strip()
+	except KeyError:
+		pass
+	else:
+		if slot and slot != "*":
+			rValue += ":" + slot
 	return str(rValue)
 
 def makeVersion(versionNode):
@@ -286,8 +293,16 @@ def makeVersion(versionNode):
 	@rtype:		String
 	@return:	the version string
 	"""
-	return opMapping[versionNode.getAttribute("range")] \
+	rValue = opMapping[versionNode.getAttribute("range")] \
 			+getText(versionNode, format="strip")
+	try:
+		slot = versionNode.getAttribute("slot").strip()
+	except KeyError:
+		pass
+	else:
+		if slot and slot != "*":
+			rValue += ":" + slot
+	return rValue
 
 def match(atom, portdbname, match_type="default"):
 	"""
@@ -331,9 +346,15 @@ def revisionMatch(revisionAtom, portdb, match_type="default"):
 	@return:	a list with the matching versions
 	"""
 	if match_type == "default" or not hasattr(portdb, "xmatch"):
-		mylist = portdb.match(re.sub("-r[0-9]+$", "", revisionAtom[2:]))
+		if ":" in revisionAtom:
+			mylist = portdb.match(re.sub(r'-r[0-9]+(:[^ ]+)?$', r'\1', revisionAtom[2:]))
+		else:
+			mylist = portdb.match(re.sub("-r[0-9]+$", "", revisionAtom[2:]))
 	else:
-		mylist = portdb.xmatch(match_type, re.sub("-r[0-9]+$", "", revisionAtom[2:]))
+		if ":" in revisionAtom:
+			mylist = portdb.xmatch(match_type, re.sub(r'-r[0-9]+(:[^ ]+)?$', r'\1', revisionAtom[2:]))
+		else:
+			mylist = portdb.xmatch(match_type, re.sub("-r[0-9]+$", "", revisionAtom[2:]))
 	rValue = []
 	for v in mylist:
 		r1 = portage.pkgsplit(v)[-1][1:]