diff options
| author | Dennis Song <denniscy@google.com> | 2024-03-29 06:30:16 +0000 |
|---|---|---|
| committer | Dennis Song <denniscy@google.com> | 2024-03-29 06:30:16 +0000 |
| commit | d0cd0acbd29cbe73d2becabf276153363f41b55b (patch) | |
| tree | 46677d0145c457169b8f7aebb5d51936bb71ed68 | |
| parent | f5341adc0cd71d1cb2a8ccb5a9fae0a102ea6180 (diff) | |
| download | treble-d0cd0acbd29cbe73d2becabf276153363f41b55b.tar.gz | |
Adapt build_chd_utils.py for use with Python versions below 3.10.
Parenthesized Context Manager was introduced in Python 3.10,
so we shouldn't use it in the CHD build script.
Bug: 331139805
Test: build_cf_hybrid_device
Change-Id: Ib2b5296405eab201fccb69f82af5bbb3825650db
| -rw-r--r-- | cuttlefish/build_chd_utils.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cuttlefish/build_chd_utils.py b/cuttlefish/build_chd_utils.py index 47c70e7..45cae9e 100644 --- a/cuttlefish/build_chd_utils.py +++ b/cuttlefish/build_chd_utils.py @@ -147,12 +147,10 @@ def merge_chd_sepolicy(framework_target_files_zip, vendor_target_files_zip, Raises: FileNotFoundError if any mandatory sepolicy file is missing. """ - with ( - tempfile.TemporaryDirectory(prefix='framework_', - dir=output_dir) as framework_dir, - tempfile.TemporaryDirectory(prefix='vendor_', - dir=output_dir) as vendor_dir, - ): + with tempfile.TemporaryDirectory(prefix='framework_', + dir=output_dir) as framework_dir, \ + tempfile.TemporaryDirectory(prefix='vendor_', + dir=output_dir) as vendor_dir: merged_policy = os.path.join(output_dir, 'chd_merged_sepolicy') _extract_cil_files(framework_target_files_zip, framework_dir) _extract_cil_files(vendor_target_files_zip, vendor_dir) |