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

Fix incorrect missing gitdir file detection

Browse source
This commit is contained in:
Erik Johnson 2016-01-12 13:15:56 -06:00
parent 530c9ec6ec
commit 911105f27c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/git.py
View file

@ -1729,11 +1729,12 @@ def list_worktrees(cwd, stale=False, user=None, **kwargs):
worktree_info[worktree_name] = worktree_loc
break
except (IOError, OSError) as exc:
if exc.errno == errno.EEXIST:
if exc.errno == errno.ENOENT:
log.warning(
gitdir_file + ' does not exist, data for worktree ' +
worktree_name + ' may be corrupted. Try pruning worktrees.'
)
continue
elif exc.errno == errno.EACCES:
raise CommandExecutionError(
'Permission denied reading from ' + gitdir_file