modules/ebuild: Add handling for InvalidAtom exception #34727
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Otherwise, an invalid pkg atom such as generated by the following state:
```SaltStack
sys-apps/systemd:
pkg.installed:
- pkgs:
- sys-apps/systemd: '[curl, importd, nat]'
```
…would lead to this backtrace:
```
ID: sys-apps/systemd
Function: pkg.installed
Result: False
Comment: An exception occurred in this state: Traceback (most recent call last):
File "/usr/lib64/python2.7/site-packages/salt/state.py", line 1723, in call
**cdata['kwargs'])
File "/usr/lib64/python2.7/site-packages/salt/loader.py", line 1650, in wrapper
return f(*args, **kwargs)
File "/usr/lib64/python2.7/site-packages/salt/states/pkg.py", line 1062, in installed
**kwargs)
File "/usr/lib64/python2.7/site-packages/salt/states/pkg.py", line 454, in _find_install_targets
if not __salt__['pkg_resource.check_extra_requirements'](key, val):
File "/usr/lib64/python2.7/site-packages/salt/modules/pkg_resource.py", line 290, in check_extra_requirements
return __salt__['pkg.check_extra_requirements'](pkgname, pkgver)
File "/usr/lib64/python2.7/site-packages/salt/modules/ebuild.py", line 1059, in check_extra_requirements
cpv = _porttree().dbapi.xmatch('bestmatch-visible', atom)
File "/usr/lib64/python2.7/site-packages/portage/dbapi/porttree.py", line 835, in xmatch
mydep = dep_expand(origdep, mydb=self, settings=self.settings)
File "/usr/lib64/python2.7/site-packages/portage/proxy/objectproxy.py", line 31, in __call__
return result(*args, **kwargs)
File "/usr/lib64/python2.7/site-packages/portage/dbapi/dep_expand.py", line 35, in dep_expand
mydep = Atom(mydep, allow_repo=True)
File "/usr/lib64/python2.7/site-packages/portage/dep/__init__.py", line 1366, in __init__
use = _use_dep(use_str[1:-1].split(","), eapi_attrs)
File "/usr/lib64/python2.7/site-packages/portage/dep/__init__.py", line 855, in __init__
raise InvalidAtom(_("Invalid use dep: '%s'") % (x,))
InvalidAtom: Invalid use dep: ' importd'
Started: 21:53:35.925124
Duration: 999.249 ms
Changes:
```
|
Thanks @eliasp! |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jul 18, 2016
* upstream/develop: (97 commits) Document how to test for the existence of a log message (saltstack#34738) Use six.iteritems instead of iteritems() in configcomparer Use six.iteritems instead of iteritems() in etcd_util Use six.iteritems instead of iteritems() in psutil_compat Use six.iteritems instead of iteritems() in junos grains Use six.iteritems instead of iteritems() in vultrpy driver Use six.iteritems instead of iteritems() in profitbricks driver Use six.iteritems instead of iteritems() in nova driver Use six.iteritems instead of iteritems() in linode driver Use six.iteritems instead of iteritems() in ec2 driver modules/ebuild: Add handling for InvalidAtom exception (saltstack#34727) Add valid function to mine module. Loop over updated keys in non recursive update Update mock value to match change in saltstack#34270. Add versionadded to "special" option in cron.present state (saltstack#34707) NILinuxRT fix timezone module (saltstack#34710) Add state module to manage InfluxDB databases Add state module to manage InfluxDB users Add influx module for InfluxDB 0.9+ Normalise function argument formatting ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise, an invalid pkg atom such as generated by the following state:
…would lead to this backtrace: