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

Merge pull request #5076 from hulu/git-status-shadowing

Browse Source 
git mod: status -> state_by_file, to avoid shadowing same-named func
This commit is contained in:
Joseph Hall 2013-05-16 18:01:38 -07:00
commit d7871015a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/git.py
View File

@ -450,13 +450,13 @@ def status(cwd, user=None):
'''
cmd = 'git status -z --porcelain'
stdout = _git_run(cmd, cwd=cwd, runas=user)
status = []
state_by_file = []
for line in stdout.split("\0"):
state = line[:2]
filename = line[3:]
if filename != '' and state != '':
status.append((state, filename))
return status
state_by_file.append((state, filename))
return state_by_file
def add(cwd, file_name, user=None, opts=None):