saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23120 from terminalmage/fix-gitfs-relpath

Browse source 
Don't run os.path.relpath() if repo doesn't have a "root" param set
This commit is contained in:
Colton Myers 2015-04-28 09:46:54 -06:00
commit a27b158153
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
salt/fileserver/gitfs.py
View file

@ -1745,7 +1745,9 @@ def _file_list_gitpython(repo, tgt_env):
tree = tree / repo['root']
except KeyError:
return files, symlinks
relpath = lambda path: os.path.relpath(path, repo['root'])
relpath = lambda path: os.path.relpath(path, repo['root'])
else:
relpath = lambda path: path
add_mountpoint = lambda path: os.path.join(repo['mountpoint'], path)
for file_blob in tree.traverse():
if not isinstance(file_blob, git.Blob):
@ -1801,10 +1803,12 @@ def _file_list_pygit2(repo, tgt_env):
return files, symlinks
if not isinstance(tree, pygit2.Tree):
return files, symlinks
relpath = lambda path: os.path.relpath(path, repo['root'])
else:
relpath = lambda path: path
blobs = {}
if len(tree):
_traverse(tree, repo['repo'], blobs, repo['root'])
relpath = lambda path: os.path.relpath(path, repo['root'])
add_mountpoint = lambda path: os.path.join(repo['mountpoint'], path)
for repo_path in blobs.get('files', []):
files.add(add_mountpoint(relpath(repo_path)))
@ -1847,7 +1851,10 @@ def _file_list_dulwich(repo, tgt_env):
blobs = {}
if len(tree):
_traverse(tree, repo['repo'], blobs, repo['root'])
relpath = lambda path: os.path.relpath(path, repo['root'])
if repo['root']:
relpath = lambda path: os.path.relpath(path, repo['root'])
else:
relpath = lambda path: path
add_mountpoint = lambda path: os.path.join(repo['mountpoint'], path)
for repo_path in blobs.get('files', []):
files.add(add_mountpoint(relpath(repo_path)))
@ -1918,7 +1925,9 @@ def _dir_list_gitpython(repo, tgt_env):
tree = tree / repo['root']
except KeyError:
return ret
relpath = lambda path: os.path.relpath(path, repo['root'])
relpath = lambda path: os.path.relpath(path, repo['root'])
else:
relpath = lambda path: path
add_mountpoint = lambda path: os.path.join(repo['mountpoint'], path)
for blob in tree.traverse():
if isinstance(blob, git.Tree):
@ -1961,10 +1970,12 @@ def _dir_list_pygit2(repo, tgt_env):
return ret
if not isinstance(tree, pygit2.Tree):
return ret
relpath = lambda path: os.path.relpath(path, repo['root'])
else:
relpath = lambda path: path
blobs = []
if len(tree):
_traverse(tree, repo['repo'], blobs, repo['root'])
relpath = lambda path: os.path.relpath(path, repo['root'])
add_mountpoint = lambda path: os.path.join(repo['mountpoint'], path)
for blob in blobs:
ret.add(add_mountpoint(relpath(blob)))
@ -2002,7 +2013,10 @@ def _dir_list_dulwich(repo, tgt_env):
blobs = []
if len(tree):
_traverse(tree, repo['repo'], blobs, repo['root'])
relpath = lambda path: os.path.relpath(path, repo['root'])
if repo['root']:
relpath = lambda path: os.path.relpath(path, repo['root'])
else:
relpath = lambda path: path
add_mountpoint = lambda path: os.path.join(repo['mountpoint'], path)
for blob in blobs:
ret.add(add_mountpoint(relpath(blob)))