Skip to content

Commit

Permalink
Merge pull request #50339 from bartlaarhoven/patch-1
Browse files Browse the repository at this point in the history
The driver requires dependency, not the other way around.
  • Loading branch information
Nicole Thomas committed Nov 5, 2018
2 parents 9fbf5fc + c46311c commit 4a33b8e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion salt/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def _gather_buffer_space():
# Return the higher number between 5% of the system memory and 10MiB
return max([total_mem * 0.05, 10 << 20])


# For the time being this will be a fixed calculation
# TODO: Allow user configuration
_DFLT_IPC_WBUFFER = _gather_buffer_space() * .5
Expand Down Expand Up @@ -3474,7 +3475,7 @@ def check_driver_dependencies(driver, dependencies):
if value is False:
log.warning(
"Missing dependency: '%s'. The %s driver requires "
"'%s' to be installed.", key, key, driver
"'%s' to be installed.", key, driver, key
)
ret = False

Expand Down

0 comments on commit 4a33b8e

Please sign in to comment.