diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-03-03 21:42:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-03 21:42:46 +0000 |
| commit | d042ce847d7fef4fa45030cf16f1a09c736578ef (patch) | |
| tree | 9cf670db0041e4733630d9ee9ba0bbfedc109708 | |
| parent | make sure uid is an int (diff) | |
| download | portage-multirepo-d042ce847d7fef4fa45030cf16f1a09c736578ef.tar.gz portage-multirepo-d042ce847d7fef4fa45030cf16f1a09c736578ef.tar.bz2 portage-multirepo-d042ce847d7fef4fa45030cf16f1a09c736578ef.zip | |
Pass waiting_msg into recursive lockfile() calls.
svn path=/main/trunk/; revision=6156
| -rw-r--r-- | pym/portage/locks.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/locks.py b/pym/portage/locks.py index cbf7ee4b..16710943 100644 --- a/pym/portage/locks.py +++ b/pym/portage/locks.py @@ -53,7 +53,8 @@ def lockfile(mypath, wantnewlockfile=0, unlinkfile=0, waiting_msg=None): os.chown(lockfilename,os.getuid(),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: writemsg("Cannot chown a lockfile. This could cause inconvenience later.\n"); os.umask(old_mask) @@ -110,7 +111,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) 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) writemsg(str((lockfilename,myfd,unlinkfile))+"\n",1) return (lockfilename,myfd,unlinkfile,locking_method) |