valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2018.3' into 51673_multiple_file_sections_with_excludes

Browse Source
This commit is contained in:
Gareth J. Greenaway 2019-02-28 08:31:38 -08:00 committed by GitHub
commit 8c4485d556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/grains/zfs.py
View File

@ -45,6 +45,9 @@ def __virtual__():
'''
# NOTE: we always load this grain so we can properly export
# at least the zfs_support grain
# except for Windows... don't try to load this on Windows (#51703)
if salt.utils.platform.is_windows():
return False, 'ZFS: Not available on Windows'
return __virtualname__

8
salt/modules/win_pkg.py
View File

@ -579,7 +579,7 @@ def refresh_db(**kwargs):
The database is stored in a serialized format located by default at the
following location:
`C:\salt\var\cache\salt\minion\files\base\win\repo-ng\winrepo.p`
``C:\salt\var\cache\salt\minion\files\base\win\repo-ng\winrepo.p``
This module performs the following steps to generate the software metadata
database:
@ -587,7 +587,7 @@ def refresh_db(**kwargs):
- Fetch the package definition files (.sls) from `winrepo_source_dir`
(default `salt://win/repo-ng`) and cache them in
`<cachedir>\files\<saltenv>\<winrepo_source_dir>`
(default: `C:\salt\var\cache\salt\minion\files\base\win\repo-ng`)
(default: ``C:\salt\var\cache\salt\minion\files\base\win\repo-ng``)
- Call :py:func:`pkg.genrepo <salt.modules.win_pkg.genrepo>` to parse the
package definition files and generate the repository metadata database
file (`winrepo.p`)
@ -783,7 +783,7 @@ def _get_repo_details(saltenv):
def genrepo(**kwargs):
'''
Generate package metedata db based on files within the winrepo_source_dir
Generate package metadata db based on files within the winrepo_source_dir
Kwargs:
@ -1828,7 +1828,7 @@ def purge(name=None, pkgs=None, **kwargs):
def get_repo_data(saltenv='base'):
'''
Returns the existing package meteadata db. Will create it, if it does not
Returns the existing package metadata db. Will create it, if it does not
exist, however will not refresh it.
Args: