]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake/unlockfile: Fix exception handling
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 26 Jan 2011 12:20:14 +0000 (12:20 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 21 Feb 2011 13:25:21 +0000 (13:25 +0000)
(From Poky rev: 5f866ac84f72699139be1d98f010017c7b71f0f7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/utils.py

index 7e19da466d532964899ee69a498a62b0dbb1faad..0b5aa0d5f7c2903cda6b53f2e2785a1bb44c7767 100644 (file)
@@ -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()