From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 26 Jan 2011 12:20:14 +0000 (+0000)
Subject: bitbake/unlockfile: Fix exception handling
X-Git-Tag: 2011-1~2686
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5f866ac84f72699139be1d98f010017c7b71f0f7;p=openembedded-core.git

bitbake/unlockfile: Fix exception handling

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index f2a79bd630..a8da672b51 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -450,7 +450,7 @@ def unlockfile(lf):
         # removing the lockfile. Attempt this, ignore failures.
         fcntl.flock(lf.fileno(), fcntl.LOCK_EX|fcntl.LOCK_NB)
         os.unlink(lf.name)
-    except IOError, OSError:
+    except (IOError, OSError):
         pass
     fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
     lf.close()