arek - r7271 - in flumotion/trunk: . flumotion/common

[flumotion-commit at lists.fluendo.com]

Author: arek
Date: Sun Aug 24 12:35:53 2008
New Revision: 7271

Log:
	* flumotion/common/bundle.py:
	Revert r6608 and r6614, as they introduced a fatal race condition
	in the unbundling code. Fixes #1116.



Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/common/bundle.py

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Sun Aug 24 12:35:53 2008
@@ -1,3 +1,9 @@
+2008-08-24  Arek Korbik  <arkadini at gmail.com>
+
+	* flumotion/common/bundle.py:
+	Revert r6608 and r6614, as they introduced a fatal race condition
+	in the unbundling code. Fixes #1116.
+
 2008-08-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/service/main.py:

Modified: flumotion/trunk/flumotion/common/bundle.py
==============================================================================
--- flumotion/trunk/flumotion/common/bundle.py	(original)
+++ flumotion/trunk/flumotion/common/bundle.py	Sun Aug 24 12:35:53 2008
@@ -177,11 +177,6 @@
             handle = os.fdopen(fd, 'wb')
             handle.write(data)
             handle.close()
-
-            # os.rename on Win32 is not deleting the target file
-            # if it exists, so remove it before
-            if os.path.exists(path):
-                os.unlink(path)
             os.rename(tempname, path)
         return directory