From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 12 Mar 2009 05:54:56 +0000 (-0000)
Subject: Bug #262211 - Avoid triggering an InvalidAtom exception inside the Package
X-Git-Tag: v2.1.6.8~17
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7292c40745e79e7d2b956b238ca236b8eac9c90d;p=portage.git

Bug #262211 - Avoid triggering an InvalidAtom exception inside the Package
constructor when SLOT is empty. (trunk r13061)

svn path=/main/branches/2.1.6/; revision=13075
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 878812b9a..6cc58c71b 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1549,7 +1549,12 @@ class Package(Task):
 		self.root = self.root_config.root
 		self.metadata = _PackageMetadataWrapper(self, self.metadata)
 		self.cp = portage.cpv_getkey(self.cpv)
-		self.slot_atom = portage.dep.Atom("%s:%s" % (self.cp, self.slot))
+		slot = self.slot
+		if not slot:
+			# Avoid an InvalidAtom exception when creating slot_atom.
+			# This package instance will be masked due to empty SLOT.
+			slot = '0'
+		self.slot_atom = portage.dep.Atom("%s:%s" % (self.cp, slot))
 		self.category, self.pf = portage.catsplit(self.cpv)
 		self.cpv_split = portage.catpkgsplit(self.cpv)
 		self.pv_split = self.cpv_split[1:]