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, 52 insertions, 49 deletions

diff --git a/file_lock_machine.py b/file_lock_machine.py
index 9b1d3367..8493b082 100755
--- a/file_lock_machine.py
+++ b/file_lock_machine.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
 #
 # Copyright 2010 Google Inc. All Rights Reserved.
 """Script to lock/unlock machines."""
@@ -79,9 +79,11 @@ class LockDescription(object):
     return self.counter or self.exclusive
 
   def __str__(self):
-    return ' '.join(['Owner: %s' % self.owner, 'Exclusive: %s' % self.exclusive,
-                     'Counter: %s' % self.counter, 'Time: %s' % self.time,
-                     'Reason: %s' % self.reason, 'Auto: %s' % self.auto])
+    return ' '.join([
+        'Owner: %s' % self.owner, 'Exclusive: %s' % self.exclusive,
+        'Counter: %s' % self.counter, 'Time: %s' % self.time,
+        'Reason: %s' % self.reason, 'Auto: %s' % self.auto
+    ])
 
 
 class FileLock(object):
@@ -120,9 +122,8 @@ class FileLock(object):
           (os.path.basename(file_lock.getFilePath),
            file_lock.getDescription().owner,
            file_lock.getDescription().exclusive,
-           file_lock.getDescription().counter,
-           elapsed_time, file_lock.getDescription().reason,
-           file_lock.getDescription().auto))
+           file_lock.getDescription().counter, elapsed_time,
+           file_lock.getDescription().reason, file_lock.getDescription().auto))
     table = '\n'.join(lock_strings)
     return '\n'.join([header, table])
 
@@ -199,8 +200,8 @@ class Lock(object):
     with FileLock(self._lock_file) as lock:
       if lock.exclusive:
         self._logger.LogError(
-            'Exclusive lock already acquired by %s. Reason: %s' %
-            (lock.owner, lock.reason))
+            'Exclusive lock already acquired by %s. Reason: %s' % (lock.owner,
+                                                                   lock.reason))
         return False
 
       if exclusive:
@@ -245,9 +246,10 @@ class Lock(object):
         lock.owner = ''
 
         if self._auto:
-          del_list = [i
-                      for i in FileLock.FILE_OPS
-                      if i.name == FileCheckName(self._lock_file)]
+          del_list = [
+              i for i in FileLock.FILE_OPS
+              if i.name == FileCheckName(self._lock_file)
+          ]
           for i in del_list:
             FileLock.FILE_OPS.remove(i)
           for f in del_list:
@@ -287,8 +289,7 @@ class Machine(object):
       if locked or not timeout >= 0:
         break
       print('Lock not acquired for {0}, wait {1} seconds ...'.format(
-          self._name,
-          sleep))
+          self._name, sleep))
       time.sleep(sleep)
       timeout -= sleep
     return locked
@@ -302,41 +303,43 @@ def Main(argv):
   """The main function."""
 
   parser = argparse.ArgumentParser()
-  parser.add_argument('-r',
-                      '--reason',
-                      dest='reason',
-                      default='',
-                      help='The lock reason.')
-  parser.add_argument('-u',
-                      '--unlock',
-                      dest='unlock',
-                      action='store_true',
-                      default=False,
-                      help='Use this to unlock.')
-  parser.add_argument('-l',
-                      '--list_locks',
-                      dest='list_locks',
-                      action='store_true',
-                      default=False,
-                      help='Use this to list locks.')
-  parser.add_argument('-f',
-                      '--ignore_ownership',
-                      dest='ignore_ownership',
-                      action='store_true',
-                      default=False,
-                      help="Use this to force unlock on a lock you don't own.")
-  parser.add_argument('-s',
-                      '--shared',
-                      dest='shared',
-                      action='store_true',
-                      default=False,
-                      help='Use this for a shared (non-exclusive) lock.')
-  parser.add_argument('-d',
-                      '--dir',
-                      dest='locks_dir',
-                      action='store',
-                      default=Machine.LOCKS_DIR,
-                      help='Use this to set different locks_dir')
+  parser.add_argument(
+      '-r', '--reason', dest='reason', default='', help='The lock reason.')
+  parser.add_argument(
+      '-u',
+      '--unlock',
+      dest='unlock',
+      action='store_true',
+      default=False,
+      help='Use this to unlock.')
+  parser.add_argument(
+      '-l',
+      '--list_locks',
+      dest='list_locks',
+      action='store_true',
+      default=False,
+      help='Use this to list locks.')
+  parser.add_argument(
+      '-f',
+      '--ignore_ownership',
+      dest='ignore_ownership',
+      action='store_true',
+      default=False,
+      help="Use this to force unlock on a lock you don't own.")
+  parser.add_argument(
+      '-s',
+      '--shared',
+      dest='shared',
+      action='store_true',
+      default=False,
+      help='Use this for a shared (non-exclusive) lock.')
+  parser.add_argument(
+      '-d',
+      '--dir',
+      dest='locks_dir',
+      action='store',
+      default=Machine.LOCKS_DIR,
+      help='Use this to set different locks_dir')
   parser.add_argument('args', nargs='*', help='Machine arg.')
 
   options = parser.parse_args(argv)