ovs.daemon: Fix bug introduced by "pychecker" warning fixes.
authorBen Pfaff <blp@nicira.com>
Thu, 29 Sep 2011 06:09:33 +0000 (23:09 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 29 Sep 2011 14:30:51 +0000 (07:30 -0700)
Commit 591c20651f1 "daemon.py: Don't shadow built-in 'file' variable"
changed most instances of "file" to "file_handle" but missed this one.

I'm not certain that this solves a real problem, but it still seems wrong.

Bug #7533.

python/ovs/daemon.py

index a919c53ecb4ab178f60e259086c827aa4b1af40b..5937877c3e1e52cc8fca25555fa8210e2ab12be5 100644 (file)
@@ -141,7 +141,7 @@ def _make_pidfile():
         # This is global to keep Python from garbage-collecting and
         # therefore closing our file after this function exits.  That would
         # unlock the lock for us, and we don't want that.
-        global file
+        global file_handle
 
         file_handle = open(tmpfile, "w")
     except IOError, e: