Fix name setting when applying SVN settings in patches
"name" is passed in as a function argument, but its "redelcared" in another iterator.
Yay dynamic scoping.
BUG=
Review URL: https://codereview.chromium.org/258173002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268593 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/checkout.py b/checkout.py
index 06b2d3b..f58dedd 100644
--- a/checkout.py
+++ b/checkout.py
@@ -682,19 +682,19 @@
if verbose:
cmd.append('--verbose')
stdout.append(self._check_output_git(cmd, stdin=p.get(True)))
- for name, value in p.svn_properties:
+ for key, value in p.svn_properties:
# Ignore some known auto-props flags through .subversion/config,
# bails out on the other ones.
# TODO(maruel): Read ~/.subversion/config and detect the rules that
# applies here to figure out if the property will be correctly
# handled.
- stdout.append('Property %s=%s' % (name, value))
- if not name in (
+ stdout.append('Property %s=%s' % (key, value))
+ if not key in (
'svn:eol-style', 'svn:executable', 'svn:mime-type'):
raise patch.UnsupportedPatchFormat(
p.filename,
'Cannot apply svn property %s to file %s.' % (
- name, p.filename))
+ key, p.filename))
for post in post_processors:
post(self, p)
if verbose:
