%s/os.getlogin/getpass.getuser/g.
Replaced all os.getlogin() function calls to getpass.getuser() function
calls. os.getlogin() doesn't work when the script is called from a cron
job.
TESTED=Ran lock_machine.py ahmad.mtv
PRESUBMIT=passed
BUG=5690035
R=bjanakiraman,kbaclawski,raymes
CC=c-compiler-chrome
DELTA=6 (2 added, 0 deleted, 4 changed)
OCL=57094-p2
RCL=57100-p2
RDATE=2011/11/30 12:49:15
P4 change: 42660552
diff --git a/v14/lock_machine.py b/v14/lock_machine.py
index a0079a8..c5f9809 100755
--- a/v14/lock_machine.py
+++ b/v14/lock_machine.py
@@ -10,6 +10,7 @@
import datetime
import fcntl
+import getpass
import glob
import optparse
import os
@@ -138,7 +139,7 @@
return False
lock.exclusive = True
lock.reason = reason
- lock.owner = os.getlogin()
+ lock.owner = getpass.getuser()
lock.time = time.time()
else:
lock.counter += 1
@@ -156,9 +157,9 @@
return False
if lock.exclusive:
- if lock.owner != os.getlogin() and not force:
+ if lock.owner != getpass.getuser() and not force:
self._logger.LogError("%s can't unlock lock owned by: %s" %
- (os.getlogin(), lock.owner))
+ (getpass.getuser(), lock.owner))
return False
lock.exclusive = False
lock.reason = ""