diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2020-02-10 16:51:20 -0800 |
|---|---|---|
| committer | Zhizhou Yang <zhizhouy@google.com> | 2020-02-12 01:34:49 +0000 |
| commit | 81d651f89ac91819a77b8bd2ca720646326bf89a (patch) | |
| tree | ec2f44c02809b95d036a8c619834ec4db8dba2e4 /tc_enter_chroot.py | |
| parent | 4b68aee96e6c6b7593b8d91973168c817852b2b2 (diff) | |
| download | toolchain-utils-81d651f89ac91819a77b8bd2ca720646326bf89a.tar.gz | |
toolchain-utils: Partially port scripts to python 3
This patch ports some still-in-use python scripts under root directory
of toolchain-utils to python 3.
BUG=chromium:1011676
TEST=Passed unittests and tested with manually launching.
Change-Id: Id6066944780a7204fe4746cd271f41ac20f2274d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2049103
Commit-Queue: Zhizhou Yang <zhizhouy@google.com>
Tested-by: Zhizhou Yang <zhizhouy@google.com>
Auto-Submit: Zhizhou Yang <zhizhouy@google.com>
Reviewed-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'tc_enter_chroot.py')
| -rwxr-xr-x | tc_enter_chroot.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/tc_enter_chroot.py b/tc_enter_chroot.py index d919c96d..3a7538ad 100755 --- a/tc_enter_chroot.py +++ b/tc_enter_chroot.py @@ -1,6 +1,9 @@ -#!/usr/bin/env python2 -# -# Copyright 2010 Google Inc. All Rights Reserved. +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# Copyright 2010 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + """Script to enter the ChromeOS chroot with mounted sources. This script enters the chroot with mounted sources. @@ -191,10 +194,10 @@ def Main(argv, return_output=False): '%s/../../../third_party' % os.path.dirname(__file__)) if os.path.isdir(third_party_dir): - mount_point = MountPoint(third_party_dir, - ('%s/%s' % (full_mounted_tc_root, - os.path.basename(third_party_dir))), - getpass.getuser()) + mount_point = MountPoint( + third_party_dir, + ('%s/%s' % (full_mounted_tc_root, os.path.basename(third_party_dir))), + getpass.getuser()) mount_points.append(mount_point) output = options.output @@ -243,16 +246,15 @@ def Main(argv, return_output=False): inner_command = inner_command[3:] command_file = 'tc_enter_chroot.cmd' command_file_path = chromeos_root + '/src/scripts/' + command_file - retv = command_executer.GetCommandExecuter().RunCommand( - 'sudo rm -f ' + command_file_path) + retv = command_executer.GetCommandExecuter().RunCommand('sudo rm -f ' + + command_file_path) if retv != 0: return retv - f = open(command_file_path, 'w') - f.write(inner_command) - f.close() + with open(command_file_path, 'w', encoding='utf-8') as f: + f.write(inner_command) logger.GetLogger().LogCmd(inner_command) - retv = command_executer.GetCommandExecuter().RunCommand( - 'chmod +x ' + command_file_path) + retv = command_executer.GetCommandExecuter().RunCommand('chmod +x ' + + command_file_path) if retv != 0: return retv |