api: Retrieve PORTAGE_LOGDIR variable from sysroot
Use PORTAGE_LOGDIR variable to interact with a given sysroot's log
directory. This property replaces hard-coded paths to Portage build
logs.
BUG=b:204816060
TEST=unit
Change-Id: I2dafdc88aea57c925fda1b654f937f72eff16b3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3291945
Commit-Queue: Lizzy Presland <zland@google.com>
Auto-Submit: Lizzy Presland <zland@google.com>
Tested-by: Lizzy Presland <zland@google.com>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/api/controller/sysroot.py b/api/controller/sysroot.py
index e28eed2..4673954 100644
--- a/api/controller/sysroot.py
+++ b/api/controller/sysroot.py
@@ -213,7 +213,7 @@
# /build/${BOARD}/tmp/portage/logs/$CATEGORY:$PF:$TIMESTAMP.log
failed_pkg_data_msg = output_proto.failed_package_data.add()
controller_util.serialize_package_info(pkg_info, failed_pkg_data_msg.name)
- glob_path = os.path.join(target_sysroot.path, 'tmp', 'portage', 'logs',
+ glob_path = os.path.join(target_sysroot.portage_logdir,
f'{pkg_info.category}:{pkg_info.package}:*.log')
log_files = glob.glob(glob_path)
log_files.sort(reverse=True)
@@ -295,7 +295,7 @@
# /build/${BOARD}/tmp/portage/logs/$CATEGORY:$PF:$TIMESTAMP.log
failed_pkg_data_msg = output_proto.failed_package_data.add()
controller_util.serialize_package_info(pkg_info, failed_pkg_data_msg.name)
- glob_path = os.path.join(target_sysroot.path, 'tmp', 'portage', 'logs',
+ glob_path = os.path.join(target_sysroot.portage_logdir,
f'{pkg_info.category}:{pkg_info.package}:*.log')
log_files = glob.glob(glob_path)
log_files.sort(reverse=True)