aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2023-03-30 17:56:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-30 17:56:28 +0000
commitbcae204d7a9bdbfb2ad64f54b602b041162fab5a (patch)
tree22b3b1f8487bddd88b3860a8e61b058476fd8dd6
parent6dc6895661bb06d52a3a3a5b8a4bc7b1b650c2e6 (diff)
parentbd897edbaf85fe9b6c2d19f45b1d91cfe70d2bbf (diff)
downloadexternal_updater-bcae204d7a9bdbfb2ad64f54b602b041162fab5a.tar.gz
Fix the mypy regressions I introduced :( am: 12e45e4fbe am: 9e5f3d5a96 am: bd897edbaf
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/2513909 Change-Id: Ic74ddae9e07f3c4da2e80df99ca928ff84645595 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--external_updater.py2
-rw-r--r--fileutils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/external_updater.py b/external_updater.py
index 68550fb..49b6883 100644
--- a/external_updater.py
+++ b/external_updater.py
@@ -120,7 +120,7 @@ def _do_update(args: argparse.Namespace, updater: Updater,
return
try:
- rel_proj_path = fileutils.get_relative_project_path(full_path)
+ rel_proj_path = str(fileutils.get_relative_project_path(full_path))
except ValueError:
# Absolute paths to other trees will not be relative to our tree. There are
# not portable instructions for upgrading that project, since the path will
diff --git a/fileutils.py b/fileutils.py
index 09aab37..789dc7c 100644
--- a/fileutils.py
+++ b/fileutils.py
@@ -111,7 +111,7 @@ def write_metadata(proj_path: Path, metadata: metadata_pb2.MetaData, keep_date:
date.month = now.month
date.day = now.day
try:
- rel_proj_path = get_relative_project_path(proj_path)
+ rel_proj_path = str(get_relative_project_path(proj_path))
except ValueError:
# Absolute paths to other trees will not be relative to our tree. There are
# not portable instructions for upgrading that project, since the path will