[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/, gentoopm/basepm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     9d4789c7871d2c52b67fc304b5795d0ee60d985c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 16:24:54 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 16:24:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=9d4789c7

Fix matching blockers.

---
 gentoopm/basepm/atom.py    |    7 +++++--
 gentoopm/paludispm/atom.py |    5 ++++-
 gentoopm/pkgcorepm/atom.py |    2 +-
 gentoopm/portagepm/atom.py |    9 ++++++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/gentoopm/basepm/atom.py b/gentoopm/basepm/atom.py
index e745a38..368b72a 100644
--- a/gentoopm/basepm/atom.py
+++ b/gentoopm/basepm/atom.py
@@ -115,8 +115,11 @@ class PMAtom(ABCObject, StringifiedComparisons):
 	@abstractmethod
 	def __contains__(self, pkg):
 		"""
-		Check whether a package matches the atom (is contained in the set
-		of packages matched by atom).
+		Check whether a package is contained in the set of packages matched
+		by the atom.
+
+		Please note that with blockers, this function returns C{True} for all
+		atoms not blocked by the atom.
 
 		@param pkg: a package to match
 		@type pkg: L{PMPackage}

diff --git a/gentoopm/paludispm/atom.py b/gentoopm/paludispm/atom.py
index ec5b830..60b4b05 100644
--- a/gentoopm/paludispm/atom.py
+++ b/gentoopm/paludispm/atom.py
@@ -83,7 +83,7 @@ class PaludisAtom(PMAtom):
 				self._incomplete = True
 		self._env = env
 
-	def __contains__(self, pkg):
+	def _match(self, pkg):
 		# we have to implementing matching by hand, boo
 		other = pkg.atom
 		# 1) category, our may be unset
@@ -112,6 +112,9 @@ class PaludisAtom(PMAtom):
 			return False
 		return True
 
+	def __contains__(self, pkg):
+		return self._match(pkg) != self.blocking
+
 	def __str__(self):
 		if self._incomplete:
 			raise ValueError('Unable to stringify incomplete atom')

diff --git a/gentoopm/pkgcorepm/atom.py b/gentoopm/pkgcorepm/atom.py
index ac0a350..5eced44 100644
--- a/gentoopm/pkgcorepm/atom.py
+++ b/gentoopm/pkgcorepm/atom.py
@@ -104,7 +104,7 @@ class PkgCoreAtom(PMAtom):
 				raise InvalidAtomStringError('Incorrect atom: %s' % s)
 
 	def __contains__(self, pkg):
-		return self._r.match(pkg._pkg)
+		return self._r.match(pkg._pkg) != self.blocking
 
 	def __str__(self):
 		if self.complete:

diff --git a/gentoopm/portagepm/atom.py b/gentoopm/portagepm/atom.py
index 425fd1e..9130d6a 100644
--- a/gentoopm/portagepm/atom.py
+++ b/gentoopm/portagepm/atom.py
@@ -78,13 +78,16 @@ class CompletePortageAtom(PMAtom):
 	def __init__(self, a):
 		self._atom = a
 
-	def __contains__(self, pkg):
+	def _match(self, pkg):
 		# SLOT matching requires metadata so delay it.
-		if not match_from_list(self._atom, [pkg.id]):
+		if not match_from_list(self._atom, [pkg._cpv]):
 			return False
 		return not self._atom.slot \
 				or self._atom.slot == pkg.metadata.SLOT
 
+	def __contains__(self, pkg):
+		return self._match(pkg) != self.blocking
+
 	def __str__(self):
 		return str(self._atom)
 
@@ -94,7 +97,7 @@ class CompletePortageAtom(PMAtom):
 
 	@property
 	def blocking(self):
-		return self._atom.blocker
+		return bool(self._atom.blocker)
 
 	@property
 	def key(self):