From 5fb9c6a5b35220e27b3acd5861318584588cd0d8 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Tue, 8 Nov 2022 00:54:56 +0000 Subject: v2.29.7: Revert back to v2.29.5 This change reverts stable to v2.29.5, to fix clients that received v2.29.6, and keep future updates simpler. Change-Id: I2f5c52c466b7321665c9699ccdbf98f928483fee --- git_config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'git_config.py') diff --git a/git_config.py b/git_config.py index 94378e9a..6f80ae08 100644 --- a/git_config.py +++ b/git_config.py @@ -219,8 +219,8 @@ class GitConfig(object): """Set the value(s) for a key. Only this configuration file is modified. - The supplied value should be either a string, or a list of strings (to - store multiple values), or None (to delete the key). + The supplied value should be either a string, + or a list of strings (to store multiple values). """ key = _key(name) @@ -349,9 +349,9 @@ class GitConfig(object): except OSError: return None try: - with Trace(': parsing %s', self.file): - with open(self._json) as fd: - return json.load(fd) + Trace(': parsing %s', self.file) + with open(self._json) as fd: + return json.load(fd) except (IOError, ValueError): platform_utils.remove(self._json, missing_ok=True) return None -- cgit v1.2.3-54-g00ecf