From 9888accb0cf2c17e0f4bbc399782ccd2a4be0196 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 9 Mar 2021 11:31:14 -0500 Subject: [PATCH] project: fix diff printing with embedded % The recent commit 84230009ee4282b947482f0d4fc4fe9e9ebc9e01 ("project: make diff tools synchronous") broke repo diff if it includes % formats. Add an explicit format string to fix. Bug: https://crbug.com/gerrit/14208 Change-Id: Ie255a43c5b767488616b2b3dd15abc18f93bfab2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/299402 Reviewed-by: Michael Mortensen Tested-by: Mike Frysinger --- project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.py b/project.py index 474d6579..45b6c636 100644 --- a/project.py +++ b/project.py @@ -863,7 +863,7 @@ class Project(object): out.nl() out.project('project %s/' % self.relpath) out.nl() - out.write(p.stdout) + out.write('%s', p.stdout) return p.Wait() == 0 # Publish / Upload ##