commit 6d95f05ab6ff69af0b0e16ad9eefb6beb6113f46
author Guenter Roeck <groeck@chromium.org> Thu Jan 20 14:23:17 2022 -0800
committer Commit Bot <commit-bot@chromium.org> Thu Jan 20 22:58:36 2022 +0000
tree 385be799cc3d2ea7aae5231d0446798bcf5f4479
parent d87a387e8e0c286713778170a9191af7a00555be

findmissing: Make repo upload happy

Apparently additional checks have been added to the uploader
since the last commit. Fix all reported errors prior to the next commit.

BUG=b:215375528
TEST=Upload using "repo upload" succeeds

Change-Id: I451bab3c81cc4a6da0ff7bde81fd3cfe28a182c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3405074
Reviewed-by: Curtis Malainey <cujomalainey@chromium.org>
Commit-Queue: Guenter Roeck <groeck@chromium.org>
Tested-by: Guenter Roeck <groeck@chromium.org>

contrib/findmissing/gerrit_interface.py

diff --git a/contrib/findmissing/gerrit_interface.py b/contrib/findmissing/gerrit_interface.py
index 1b973a9..83542ae 100755
--- a/contrib/findmissing/gerrit_interface.py
+++ b/contrib/findmissing/gerrit_interface.py
@@ -25,7 +25,7 @@
 import http
 import os
 import re
-import requests
+import requests # pylint: disable=import-error
 
 import common
 import git_interface
@@ -35,14 +35,14 @@
     """Load cookies in order to authenticate requests with gerrit/googlesource."""
     # This cookie should exist in order to perform GAIA authenticated requests
     try:
-        gerrit_credentials_cookies = \
-                http.cookiejar.MozillaCookieJar(common.GCE_GIT_COOKIE_PATH, None, None)
+        gerrit_credentials_cookies = (
+                http.cookiejar.MozillaCookieJar(common.GCE_GIT_COOKIE_PATH, None, None))
         gerrit_credentials_cookies.load()
         return gerrit_credentials_cookies
     except FileNotFoundError:
         try:
-            gerrit_credentials_cookies = \
-                    http.cookiejar.MozillaCookieJar(common.LOCAL_GIT_COOKIE_PATH, None, None)
+            gerrit_credentials_cookies = (
+                    http.cookiejar.MozillaCookieJar(common.LOCAL_GIT_COOKIE_PATH, None, None))
             gerrit_credentials_cookies.load()
             return gerrit_credentials_cookies
         except FileNotFoundError:
@@ -82,9 +82,7 @@
     """Returns the changeid with url-encoding in project~branch~changeid format."""
     project = 'chromiumos%2Fthird_party%2Fkernel'
     chromeos_branch = common.chromeos_branch(branch)
-    return '{project}~{branch}~{changeid}'.format(project=project,
-                                                    branch=chromeos_branch,
-                                                    changeid=changeid)
+    return '%s~%s~%s' % (project, chromeos_branch, changeid)
 
 
 def get_reviewers(changeid, branch):
@@ -196,10 +194,7 @@
     cherry_picked = '(cherry picked from commit %s)\n\n'% upstream_full_sha
 
 
-    commit_message = ('UPSTREAM: {fix_commit_msg}'
-                      '{cherry_picked}'
-                      '{bug_test_line}').format(fix_commit_msg=fix_upstream_commit_msg,
-                        cherry_picked=cherry_picked, bug_test_line=bug_test_line)
+    commit_message = 'UPSTREAM: %s%s%s' % (fix_upstream_commit_msg, cherry_picked, bug_test_line)
 
     return commit_message
 

contrib/findmissing/git_interface.py

diff --git a/contrib/findmissing/git_interface.py b/contrib/findmissing/git_interface.py
index 3f1c1f0..beb9830 100755
--- a/contrib/findmissing/git_interface.py
+++ b/contrib/findmissing/git_interface.py
@@ -165,7 +165,7 @@
 class commitHandler:
     """Class to control active accesses on a git repository"""
 
-    commit_list = { }
+    commit_list = {}
 
     def __init__(self, kernel, branch=None, full_reset=True):
         self.kernel = kernel
@@ -179,7 +179,7 @@
         self.full_reset = full_reset
 
         if kernel not in self.commit_list:
-            self.commit_list[kernel] = { }
+            self.commit_list[kernel] = {}
 
         current_branch_cmd = ['symbolic-ref', '-q', '--short', 'HEAD']
         self.current_branch = self.__git_check_output(current_branch_cmd).rstrip()