| 1 |
Author: zmedico |
| 2 |
Date: 2009-03-11 23:59:13 +0000 (Wed, 11 Mar 2009) |
| 3 |
New Revision: 13061 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #262211 - Avoid triggering an InvalidAtom exception inside the Package |
| 9 |
constructor when SLOT is empty. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2009-03-11 23:49:03 UTC (rev 13060) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2009-03-11 23:59:13 UTC (rev 13061) |
| 16 |
@@ -1568,7 +1568,12 @@ |
| 17 |
self.root = self.root_config.root |
| 18 |
self.metadata = _PackageMetadataWrapper(self, self.metadata) |
| 19 |
self.cp = portage.cpv_getkey(self.cpv) |
| 20 |
- self.slot_atom = portage.dep.Atom("%s:%s" % (self.cp, self.slot)) |
| 21 |
+ slot = self.slot |
| 22 |
+ if not slot: |
| 23 |
+ # Avoid an InvalidAtom exception when creating slot_atom. |
| 24 |
+ # This package instance will be masked due to empty SLOT. |
| 25 |
+ slot = '0' |
| 26 |
+ self.slot_atom = portage.dep.Atom("%s:%s" % (self.cp, slot)) |
| 27 |
self.category, self.pf = portage.catsplit(self.cpv) |
| 28 |
self.cpv_split = portage.catpkgsplit(self.cpv) |
| 29 |
self.pv_split = self.cpv_split[1:] |
Archives