diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-02-15 18:40:32 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-02-15 18:40:32 +0000 |
| commit | 3f0137a817923b9eea745cf641dfe7a0516e29c4 (patch) | |
| tree | 1332d39c035097daba9a2bce7c63d19ece0273eb /pym/portage_locks.py | |
| parent | fix a race and prevent unlinking of a file locked by another process in porta... (diff) | |
| download | portage-multirepo-3f0137a817923b9eea745cf641dfe7a0516e29c4.tar.gz portage-multirepo-3f0137a817923b9eea745cf641dfe7a0516e29c4.tar.bz2 portage-multirepo-3f0137a817923b9eea745cf641dfe7a0516e29c4.zip | |
fix case where myfd == None (regression from revision 2714)
svn path=/main/trunk/; revision=2715
Diffstat (limited to 'pym/portage_locks.py')
| -rw-r--r-- | pym/portage_locks.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage_locks.py b/pym/portage_locks.py index 7a9b5567..f108cba2 100644 --- a/pym/portage_locks.py +++ b/pym/portage_locks.py @@ -147,9 +147,11 @@ def unlockfile(mytuple): unhardlink_lockfile(lockfilename) return True - if type(lockfilename) == types.StringType and os.fstat(myfd).st_nlink != 1: + # myfd may be None here due to myfd = mypath in lockfile() + if type(lockfilename) == types.StringType and not os.path.exists(lockfilename): portage_util.writemsg("lockfile does not exist '%s'\n" % lockfilename,1) - os.close(myfd) + if myfd is not None: + os.close(myfd) return False try: |