Tools/git-repo
1
0
Fork 0
Code Activity

Rename "dir" variables

Browse source 
The variable name "dir" conflicts with the name of a Python built-in
function: http://docs.python.org/library/functions.html#dir

Change-Id: I850f3ec8df7563dc85e21f2876fe5e6550ca2d8f
This commit is contained in:
Mickaël Salaün 2012-09-30 00:37:55 +02:00
parent 3a6cd4200e
commit 2f6ab7f5b8
5 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subcmds/sync.py
View file

@ -339,13 +339,13 @@ uncommitted changes are present' % project.relpath
print >>sys.stderr, 'Deleting obsolete path %s' % project.worktree
shutil.rmtree(project.worktree)
# Try deleting parent subdirs if they are empty
dir = os.path.dirname(project.worktree)
while dir != self.manifest.topdir:
project_dir = os.path.dirname(project.worktree)
while project_dir != self.manifest.topdir:
try:
os.rmdir(dir)
os.rmdir(project_dir)
except OSError:
break
dir = os.path.dirname(dir)
project_dir = os.path.dirname(project_dir)
new_project_paths.sort()
fd = open(file_path, 'w')