Skip to content
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

[2015.8] Revert loader changes from #26645 #26717

Merged
merged 2 commits into from Aug 27, 2015

Conversation

basepi
Copy link
Contributor

@basepi basepi commented Aug 27, 2015

Also change sentry handler to work without that code.

@s0undt3ch Look good? I couldn't find the original version of the sentry handler and wanted to make sure I didn't do anything stupid.

Fixes #26669

@s0undt3ch
Copy link
Member

Yep. Looks good!

@jfindlay jfindlay added Core relates to code central or existential to Salt Medium Change labels Aug 27, 2015
@basepi
Copy link
Contributor Author

basepi commented Aug 27, 2015

Go Go Jenkins!

basepi added a commit that referenced this pull request Aug 27, 2015
@basepi basepi merged commit d97d4ce into saltstack:2015.8 Aug 27, 2015
@rallytime
Copy link
Contributor

@basepi Looks like we're hitting another bug now. I just pulled this is and now i'm getting the following error:

# salt-cloud --list-images linode
[ERROR   ] Failed to import log_handlers sentry_mod, this is due most likely to a syntax error:
Traceback (most recent call last):
  File "/root/SaltStack/salt/salt/loader.py", line 1105, in _load_module
    ), fn_, fpath, desc)
  File "/root/SaltStack/salt/salt/log/handlers/sentry_mod.py", line 96, in <module>
    __grains__ = salt.loader.grains(__opts__)
NameError: name '__opts__' is not defined
[INFO    ] salt-cloud starting

@rallytime
Copy link
Contributor

Ah...I meant to put this on the issue. I'll comment there and open it again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Core relates to code central or existential to Salt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants