New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix KeyError when adding ignored pillars #30496

Merged
merged 1 commit into from Jan 21, 2016

Conversation

Projects
None yet
2 participants
@anlutro
Contributor

anlutro commented Jan 21, 2016

Fixes a mistake I did in #30354

Traceback (most recent call last):
  File "/usr/lib/python2.7/multiprocessing/process.py", line 258, in _bootstrap
    self.run()
  File "/usr/lib/python2.7/multiprocessing/process.py", line 114, in run
    self._target(*self._args, **self._kwargs)
  File "/home/andreas/dev/salt/salt/client/ssh/__init__.py", line 345, in handle_routine
    stdout, stderr, retcode = single.run()
  File "/home/andreas/dev/salt/salt/client/ssh/__init__.py", line 736, in run
    stdout, retcode = self.run_wfunc()
  File "/home/andreas/dev/salt/salt/client/ssh/__init__.py", line 811, in run_wfunc
    pillar_data = pillar.compile_pillar(pillar_dirs=pillar_dirs)
  File "/home/andreas/dev/salt/salt/pillar/__init__.py", line 666, in compile_pillar
    top, top_errors = self.get_top()
  File "/home/andreas/dev/salt/salt/pillar/__init__.py", line 423, in get_top
    merged_tops = self.merge_tops(tops)
  File "/home/andreas/dev/salt/salt/pillar/__init__.py", line 398, in merge_tops
    self.ignored_pillars[saltenv].extend(states.keys())
KeyError: 'base'

cachedout added a commit that referenced this pull request Jan 21, 2016

Merge pull request #30496 from alprs/fix-ignored_pillars_keyerror
Fix KeyError when adding ignored pillars

@cachedout cachedout merged commit 56332ca into saltstack:2015.8 Jan 21, 2016

4 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12899 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12587 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11488 — SUCCESS
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8969 — SUCCESS
Details
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 21, 2016

Contributor

Thanks, @anlutro

Contributor

cachedout commented Jan 21, 2016

Thanks, @anlutro

@anlutro anlutro deleted the alprs:fix-ignored_pillars_keyerror branch Mar 23, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment