diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-10 22:32:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-10 22:57:30 -0700 |
| commit | c0af31c9f216c86719486a8568aa07e6f32e4fc8 (patch) | |
| tree | 1816e3141c3e91d8d151230e7274387ac553cfa8 /pym/portage/versions.py | |
| parent | c864dd8d26ecc2144fd7e0ae56d12519f94dbd99 (diff) | |
| download | portage-c0af31c9f216c86719486a8568aa07e6f32e4fc8.tar.gz portage-c0af31c9f216c86719486a8568aa07e6f32e4fc8.tar.bz2 portage-c0af31c9f216c86719486a8568aa07e6f32e4fc8.zip | |
Package: move SLOT validation to _pkg_str
Diffstat (limited to 'pym/portage/versions.py')
| -rw-r--r-- | pym/portage/versions.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pym/portage/versions.py b/pym/portage/versions.py index a838800cb..a1ded6771 100644 --- a/pym/portage/versions.py +++ b/pym/portage/versions.py @@ -19,6 +19,7 @@ else: import portage portage.proxy.lazyimport.lazyimport(globals(), + 'portage.dep:_get_slot_re', 'portage.repository.config:_gen_valid_repo', 'portage.util:cmp_sort_key', ) @@ -355,7 +356,14 @@ class _pkg_str(_unicode): # for match_from_list introspection self.__dict__['cpv'] = self if slot is not None: - self.__dict__['slot'] = slot + slot_match = _get_slot_re(_get_eapi_attrs(eapi)).match(slot) + if slot_match is None: + # Avoid an InvalidAtom exception when creating SLOT atoms + self.__dict__['slot'] = '0' + self.__dict__['slot_invalid'] = slot + else: + self.__dict__['slot'] = slot + if repo is not None: repo = _gen_valid_repo(repo) if not repo: |