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

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

commit:     9e26286fca5adb0583966b4a8f7778c2b451b96d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 22:53:48 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 22:53:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=9e26286f

Reuse new Atom APIs when transforming atoms.

---
 gentoopm/paludispm/atom.py |    6 +++---
 gentoopm/portagepm/atom.py |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gentoopm/paludispm/atom.py b/gentoopm/paludispm/atom.py
index 808e8ea..ccdd612 100644
--- a/gentoopm/paludispm/atom.py
+++ b/gentoopm/paludispm/atom.py
@@ -125,14 +125,14 @@ class PaludisAtom(PMAtom):
 	@property
 	def slotted(self):
 		assert(self.associated)
-		cp = str(self._atom.package)
-		slot = self._pkg.metadata['SLOT']
+		cp = str(self.key)
+		slot = self.slot or self._pkg.metadata['SLOT']
 		return PaludisAtom('%s:%s' % (cp, slot), self._env)
 
 	@property
 	def unversioned(self):
 		assert(self.associated)
-		return PaludisAtom(str(self._atom.package), self._env)
+		return PaludisAtom(str(self.key), self._env)
 
 	@property
 	def key(self):

diff --git a/gentoopm/portagepm/atom.py b/gentoopm/portagepm/atom.py
index 7342d89..0a77f76 100644
--- a/gentoopm/portagepm/atom.py
+++ b/gentoopm/portagepm/atom.py
@@ -96,14 +96,14 @@ class CompletePortageAtom(PMAtom):
 	@property
 	def slotted(self):
 		assert(self.associated)
-		cp = self._atom.cp
+		cp = str(self.key)
 		slot = self._pkg.metadata['SLOT']
 		return PortageAtom('%s:%s' % (cp, slot))
 
 	@property
 	def unversioned(self):
 		assert(self.associated)
-		return PortageAtom(self._atom.cp)
+		return PortageAtom(str(self.key))
 
 	@property
 	def key(self):