From 6a8c1409c9999c54f770cd25ebad14bf30a37005 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 23:59:13 +0000 Subject: Bug #262211 - Avoid triggering an InvalidAtom exception inside the Package constructor when SLOT is empty. svn path=/main/trunk/; revision=13061 --- pym/_emerge/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index d103f9ecf..a0b73dd19 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1568,7 +1568,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:] -- cgit v1.2.3-1-g7c22