diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-12 05:54:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-12 05:54:56 +0000 |
| commit | 7292c40745e79e7d2b956b238ca236b8eac9c90d (patch) | |
| tree | eaa17fc1b1153b686772cb3e540526d172d76348 /pym/_emerge | |
| parent | 07b38d6ad91816d4b9418129016973a5133d7988 (diff) | |
| download | portage-7292c40745e79e7d2b956b238ca236b8eac9c90d.tar.gz portage-7292c40745e79e7d2b956b238ca236b8eac9c90d.tar.bz2 portage-7292c40745e79e7d2b956b238ca236b8eac9c90d.zip | |
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
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 7 |
1 files changed, 6 insertions, 1 deletions
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:] |