commit 5dcdb89598eafe4163f848ce26874bdb11419ad5
author Chris McDonald <cjmcdonald@chromium.org> Fri Feb 07 15:10:46 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Feb 11 22:09:32 2020 +0000
tree 6e6a29e038807dc27b2b9759f09230733f2977fd
parent cb8992a734b276cc312f9cbd5d7155c8f3122dcc

Reland: Remove ChrootPaths class

This class only had two fields that can easily just be passed as args.

Fixed SDK unittests to respect the new fields as well.

BUG=None
TEST=run_tests

Change-Id: I51473562307e100fae9eae2cfc6a88f6a0b8f270
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2050029
Tested-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>

api/controller/sdk.py

diff --git a/api/controller/sdk.py b/api/controller/sdk.py
index babdc93..a627702 100644
--- a/api/controller/sdk.py
+++ b/api/controller/sdk.py
@@ -45,9 +45,12 @@
   if config.validate_only:
     return controller.RETURN_CODE_VALID_INPUT
 
-  paths = sdk.ChrootPaths(cache_dir=cache_dir, chroot_path=chroot_path)
-  args = sdk.CreateArguments(replace=replace, bootstrap=bootstrap,
-                             use_image=use_image, paths=paths)
+  args = sdk.CreateArguments(
+      replace=replace,
+      bootstrap=bootstrap,
+      use_image=use_image,
+      cache_dir=cache_dir,
+      chroot_path=chroot_path)
 
   version = sdk.Create(args)