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

Merge pull request #29369 from thatch45/fs_meta

Browse Source 
Start on adding file metadata #2707
This commit is contained in:
Mike Place 2015-12-03 10:02:25 -07:00
commit 9dbdcef4da
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/fileserver/azurefs.py
View File

@ -97,6 +97,7 @@ def find_file(path, saltenv='base', env=None, **kwargs):
__opts__, full): __opts__, full):
fnd['path'] = full fnd['path'] = full
fnd['rel'] = path fnd['rel'] = path
fnd['stat'] = list(os.stat(full))
return fnd return fnd

1
salt/fileserver/hgfs.py
View File

@ -687,6 +687,7 @@ def find_file(path, tgt_env='base', **kwargs): # pylint: disable=W0613
pass pass
fnd['rel'] = path fnd['rel'] = path
fnd['path'] = dest fnd['path'] = dest
fnd['stat'] = list(os.stat(dest))
repo['repo'].close() repo['repo'].close()
return fnd return fnd
return fnd return fnd

1
salt/fileserver/minionfs.py
View File

@ -91,6 +91,7 @@ def find_file(path, tgt_env='base', **kwargs): # pylint: disable=W0613
and not salt.fileserver.is_file_ignored(__opts__, full): and not salt.fileserver.is_file_ignored(__opts__, full):
fnd['path'] = full fnd['path'] = full
fnd['rel'] = path fnd['rel'] = path
fnd['stat'] = list(os.stat(full))
return fnd return fnd
return fnd return fnd

2
salt/fileserver/roots.py
View File

@ -64,12 +64,14 @@ def find_file(path, saltenv='base', env=None, **kwargs):
if os.path.isfile(full) and not salt.fileserver.is_file_ignored(__opts__, full): if os.path.isfile(full) and not salt.fileserver.is_file_ignored(__opts__, full):
fnd['path'] = full fnd['path'] = full
fnd['rel'] = path fnd['rel'] = path
fnd['stat'] = list(os.stat(full))
return fnd return fnd
for root in __opts__['file_roots'][saltenv]: for root in __opts__['file_roots'][saltenv]:
full = os.path.join(root, path) full = os.path.join(root, path)
if os.path.isfile(full) and not salt.fileserver.is_file_ignored(__opts__, full): if os.path.isfile(full) and not salt.fileserver.is_file_ignored(__opts__, full):
fnd['path'] = full fnd['path'] = full
fnd['rel'] = path fnd['rel'] = path
fnd['stat'] = list(os.stat(full))
return fnd return fnd
return fnd return fnd