[PATCH] Fix KeyError "fileSize" in verbose mode
From: Sergey Yurzin <hidden>
Date: 2017-06-12 08:02:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Sergei Iurzin <redacted> --- git-p4.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 8d151da91b969..b3666eddf12e3 100755
--- a/git-p4.py
+++ b/git-p4.py@@ -2523,8 +2523,11 @@ def streamOneP4File(self, file, contents): relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes) relPath = self.encodeWithUTF8(relPath) if verbose: - size = int(self.stream_file['fileSize']) - sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'], relPath, size/1024/1024)) + if 'fileSize' in self.stream_file: + size = int(self.stream_file['fileSize']) + sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'], relPath, size/1024/1024)) + else: + sys.stdout.write('\r%s --> %s\n' % (file['depotFile'], relPath)) sys.stdout.flush() (type_base, type_mods) = split_p4_type(file["type"]) --
https://github.com/git/git/pull/373