saltstack / salt

Software to automate the management and configuration of any infrastructure or application at scale. Get access to the Salt software package repository here:
https://repo.saltproject.io/
Apache License 2.0
13.98k stars 5.47k forks source link

[master] Drop useless double calls for utils LazyLoader with salt.loader.grain_funcs #66576

Closed vzhestkov closed 1 month ago

vzhestkov commented 1 month ago

What does this PR do?

There are 2 calls for utils in salt.loader.grain_funcs instead of just one with no any reason for it. It's causing two attempts to load utils with LazyLoader when the second call seems useless.

Seems like it was caused by a collision with the following two commits: https://github.com/saltstack/salt/commit/e5b3e87e55dc512705ff6155b4086add742454f5 https://github.com/saltstack/salt/commit/78725f4cc93134af43c54e6c1d8cc6e97b6cb511

Previous Behavior

Double utils calls in salt.loader.grain_funcs.

New Behavior

Single utils call.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices, including the PR Guidelines.

See GitHub's page on GPG signing for more information about signing commits with GPG.