From c234c25114384adb80f7b795931e16653dddfc82 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 3 Mar 2007 21:47:59 +0000 Subject: Pass waiting_msg into recursive lockfile() calls. (trunk r6155:6156) svn path=/main/branches/2.1.2/; revision=6157 --- pym/portage_locks.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage_locks.py b/pym/portage_locks.py index 77044cacf..389adddde 100644 --- a/pym/portage_locks.py +++ b/pym/portage_locks.py @@ -57,7 +57,8 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0, waiting_msg=None): os.chown(lockfilename,os.getuid(),portage_data.portage_gid) except OSError, e: if e[0] == 2: # No such file or directory - return lockfile(mypath,wantnewlockfile,unlinkfile) + return lockfile(mypath, wantnewlockfile=wantnewlockfile, + unlinkfile=unlinkfile, waiting_msg=waiting_msg) else: portage_util.writemsg("Cannot chown a lockfile. This could cause inconvenience later.\n"); os.umask(old_mask) @@ -114,7 +115,9 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0, waiting_msg=None): # The file was deleted on us... Keep trying to make one... os.close(myfd) portage_util.writemsg("lockfile recurse\n",1) - lockfilename,myfd,unlinkfile,locking_method = lockfile(mypath,wantnewlockfile,unlinkfile) + lockfilename, myfd, unlinkfile, locking_method = lockfile( + mypath, wantnewlockfile=wantnewlockfile, unlinkfile=unlinkfile, + waiting_msg=waiting_msg) portage_util.writemsg(str((lockfilename,myfd,unlinkfile))+"\n",1) return (lockfilename,myfd,unlinkfile,locking_method) -- cgit v1.2.3-1-g7c22