Merge branch 'aosp/mirror-chromium-master' into update_utils am: 4307f4735e am: 18caef1edd am: 6c551e0d52 am: ddfea1f7e7android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-dev

am: f1a93c225b

Change-Id: I60d258ddb8fd0bf9632f1f70c5cdeb3078938059

1 files changed, 62 insertions, 54 deletions

diff --git a/tc_enter_chroot.py b/tc_enter_chroot.py
index 573e5585..d919c96d 100755
--- a/tc_enter_chroot.py
+++ b/tc_enter_chroot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 """Script to enter the ChromeOS chroot with mounted sources.
@@ -86,41 +86,47 @@ def Main(argv, return_output=False):
   """The main function."""
 
   parser = argparse.ArgumentParser()
-  parser.add_argument('-c',
-                      '--chromeos_root',
-                      dest='chromeos_root',
-                      default='../..',
-                      help='ChromeOS root checkout directory.')
-  parser.add_argument('-t',
-                      '--toolchain_root',
-                      dest='toolchain_root',
-                      help='Toolchain root directory.')
-  parser.add_argument('-o',
-                      '--output',
-                      dest='output',
-                      help='Toolchain output directory')
-  parser.add_argument('--sudo',
-                      dest='sudo',
-                      action='store_true',
-                      default=False,
-                      help='Run the command with sudo.')
-  parser.add_argument('-r',
-                      '--third_party',
-                      dest='third_party',
-                      help='The third_party directory to mount.')
-  parser.add_argument('-m',
-                      '--other_mounts',
-                      dest='other_mounts',
-                      help='Other mount points in the form: '
-                      'dir:mounted_dir:options')
-  parser.add_argument('-s',
-                      '--mount-scripts-only',
-                      dest='mount_scripts_only',
-                      action='store_true',
-                      default=False,
-                      help='Mount only the scripts dir, and not the sources.')
-  parser.add_argument('passthrough_argv', nargs='*',
-                      help='Command to be executed inside the chroot.')
+  parser.add_argument(
+      '-c',
+      '--chromeos_root',
+      dest='chromeos_root',
+      default='../..',
+      help='ChromeOS root checkout directory.')
+  parser.add_argument(
+      '-t',
+      '--toolchain_root',
+      dest='toolchain_root',
+      help='Toolchain root directory.')
+  parser.add_argument(
+      '-o', '--output', dest='output', help='Toolchain output directory')
+  parser.add_argument(
+      '--sudo',
+      dest='sudo',
+      action='store_true',
+      default=False,
+      help='Run the command with sudo.')
+  parser.add_argument(
+      '-r',
+      '--third_party',
+      dest='third_party',
+      help='The third_party directory to mount.')
+  parser.add_argument(
+      '-m',
+      '--other_mounts',
+      dest='other_mounts',
+      help='Other mount points in the form: '
+      'dir:mounted_dir:options')
+  parser.add_argument(
+      '-s',
+      '--mount-scripts-only',
+      dest='mount_scripts_only',
+      action='store_true',
+      default=False,
+      help='Mount only the scripts dir, and not the sources.')
+  parser.add_argument(
+      'passthrough_argv',
+      nargs='*',
+      help='Command to be executed inside the chroot.')
 
   options = parser.parse_args(argv)
 
@@ -137,8 +143,10 @@ def Main(argv, return_output=False):
     m = 'toolchain_root not specified. Will not mount toolchain dirs.'
     logger.GetLogger().LogWarning(m)
   else:
-    tc_dirs = [options.toolchain_root + '/google_vendor_src_branch/gcc',
-               options.toolchain_root + '/google_vendor_src_branch/binutils']
+    tc_dirs = [
+        options.toolchain_root + '/google_vendor_src_branch/gcc',
+        options.toolchain_root + '/google_vendor_src_branch/binutils'
+    ]
 
   for tc_dir in tc_dirs:
     if not os.path.exists(tc_dir):
@@ -154,9 +162,9 @@ def Main(argv, return_output=False):
     sys.exit(1)
 
   if not os.path.exists(chromeos_root + '/src/scripts/build_packages'):
-    logger.GetLogger(
-    ).LogError(options.chromeos_root + '/src/scripts/build_packages'
-               ' not found!')
+    logger.GetLogger().LogError(options.chromeos_root +
+                                '/src/scripts/build_packages'
+                                ' not found!')
     parser.print_help()
     sys.exit(1)
 
@@ -176,16 +184,16 @@ def Main(argv, return_output=False):
   # Add the third_party mount point if it exists
   if options.third_party:
     third_party_dir = options.third_party
-    logger.GetLogger().LogFatalIf(
-        not os.path.isdir(third_party_dir),
-        '--third_party option is not a valid dir.')
+    logger.GetLogger().LogFatalIf(not os.path.isdir(third_party_dir),
+                                  '--third_party option is not a valid dir.')
   else:
-    third_party_dir = os.path.abspath('%s/../../../third_party' %
-                                      os.path.dirname(__file__))
+    third_party_dir = os.path.abspath(
+        '%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))),
+    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)
 
@@ -195,8 +203,8 @@ def Main(argv, return_output=False):
     output = options.toolchain_root + '/output'
 
   if output:
-    mount_points.append(MountPoint(output, full_mounted_tc_root + '/output',
-                                   getpass.getuser()))
+    mount_points.append(
+        MountPoint(output, full_mounted_tc_root + '/output', getpass.getuser()))
 
   # Mount the other mount points
   mount_points += CreateMountPointsFromString(options.other_mounts,
@@ -235,16 +243,16 @@ 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()
     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