Merge revision 1659 changes:

- Fix application of patch files created with `git diff --no-prefix --relative .`

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1660 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-04-16 16:33:24 +00:00
parent 711cfe2ef6
commit e2f4cda423

View File

@ -220,7 +220,7 @@ class PatchInfo(object):
filenames = False
header = True
else:
self.source.append(match.group(1))
self.source.append(match.group(1).strip())
elif not line.startswith("+++ "):
if nextfileno in self.source:
warning("skipping invalid patch with no target for %s" % self.source[nextfileno])