Commit 64d819b6 authored by hinoka@google.com's avatar hinoka@google.com

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
parent b1d0cc13
......@@ -682,19 +682,19 @@ class GitCheckout(CheckoutBase):
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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment