commit 41f247b8650c5a80d97411daeaf724e0615e6a4c
author Brian Norris <briannorris@chromium.org> Fri Jun 30 11:09:40 2023 -0700
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 30 22:58:35 2023 +0000
tree c42e5d78305c18d4800f76d5cb6b756e6d09cb38
parent d3e391e626ab3b086ce7c0f95050ff000300973f

api: controller: Fix pb2_path_to_pathlib_path() chroot assumptions

It's not valid to do path concatenation or subtraction using
chroot.path. Use chroot_lib instead.

BUG=b:265885353
TEST=./run_tests

Change-Id: I1f5be1b97a16bdb0f91ee66b0e657aa71c9c501d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4661950
Reviewed-by: Greg Edelston <gredelston@google.com>
Tested-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Brian Norris <briannorris@chromium.org>

api/controller/controller_util.py

diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index 054838a..04a6f5e 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -317,5 +317,4 @@
         return Path(pb2_path.path)
     if chroot is None:
         raise ValueError("Cannot convert inside path without a chroot.")
-    path_relative_to_root = pb2_path.path[1:]
-    return Path(chroot.path, path_relative_to_root)
+    return Path(ParseChroot(chroot).full_path(pb2_path.path))