I pushed these.
On Wed, Sep 28, 2011 at 11:20:35PM -0700, Ethan Jackson wrote: > Looks good, > > Thanks for fixing this Ben, all the python work I'd done recently > introduced a lot of churn. > > Ethan > > On Wed, Sep 28, 2011 at 23:11, Ben Pfaff <b...@nicira.com> wrote: > > 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 | ? ?2 +- > > ?1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/python/ovs/daemon.py b/python/ovs/daemon.py > > index a919c53..5937877 100644 > > --- a/python/ovs/daemon.py > > +++ b/python/ovs/daemon.py > > @@ -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: > > -- > > 1.7.2.5 > > > > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
