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

salt: 2016.11.5 -> 2017.7.1 #29626

Closed
wants to merge 1 commit into from
Closed

salt: 2016.11.5 -> 2017.7.1 #29626

wants to merge 1 commit into from

Conversation

res0nat0r
Copy link

Motivation for this change
  • Version bump to latest: 2017.7.1
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Sep 21, 2017

Salt unity seems not to work:

$ salt-unity
Traceback (most recent call last):
  File "/nix/store/ldhz45kaba0mlab6fk8mml3nxn2j933h-salt-2017.7.1/bin/.salt-unity-wrapped", line 8, in <module>
    from salt.scripts import salt_unity
ImportError: cannot import name salt_unity

@joachifm
Copy link
Contributor

@Mic92 do you happen to know if that is a regression?

cc @aneeshusa

@res0nat0r
Copy link
Author

res0nat0r commented Sep 23, 2017

Actually it looks like the current version of salt salt-2016.11.5 is broken too:

$ salt --version
salt 2016.11.5 (Carbon)

$ salt-unity
Traceback (most recent call last):
  File "/nix/store/sr3za0jbchl9f73n5yp68ckqkgld0l1f-salt-2016.11.5/bin/.salt-unity-wrapped", line 8, in <module>
    from salt.scripts import salt_unity
ImportError: cannot import name salt_unity

This is a magic wrapper script to bring all of the other commands together under one command that can be used, I'm guessing that the Nix install / wrapper magic isn't quite working as this script is slightly different than the rest.

https://github.com/saltstack/salt/blob/v2016.11.5/scripts/salt-unity

@aneeshusa
Copy link
Contributor

I never knew about salt-unity, it looks like it was mostly added for Windows support so I'm OK leaving it broken for now. Can be fixed in a follow-up if anyone is interested.

I've already reviewed this bit in #29020 (cc @danbst) and have been using an identical patch locally, so this LGTM.

@joachifm
Copy link
Contributor

Closing in deference to #29020

@joachifm joachifm closed this Sep 24, 2017
@res0nat0r res0nat0r deleted the salt-2017.7.1 branch September 24, 2017 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants