Patchwork [bitbake-devel] Paul Eggleton : bitbake-layers: close files in apply_append()

login
mail settings
Submitter git@git.openembedded.org
Date Jan. 10, 2012, 5:49 p.m.
Message ID <20120110174903.AB19510333@opal>
Download mbox | patch
Permalink /patch/18947/
State Not Applicable
Headers show

Comments

Chris Larson - Jan. 10, 2012, 5:41 p.m.
On Tue, Jan 10, 2012 at 10:49 AM,  <git@git.openembedded.org> wrote:
> Module: bitbake.git
> Branch: master
> Commit: 470a160813ce6cf04f83258d46ded5c2ab8bc520
> URL:    http://git.openembedded.org/?p=bitbake.git&a=commit;h=470a160813ce6cf04f83258d46ded5c2ab8bc520
>
> Author: Paul Eggleton <paul.eggleton@linux.intel.com>
> Date:   Sun Jan  8 12:06:51 2012 +0000
>
> bitbake-layers: close files in apply_append()
>
> It's recommended practice to close files when finished with them and the
> code in this function was not doing this.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Given we require 2.6, fyi, you could use the context manager.
git@git.openembedded.org - Jan. 10, 2012, 5:49 p.m.
Module: bitbake.git
Branch: master
Commit: 470a160813ce6cf04f83258d46ded5c2ab8bc520
URL:    http://git.openembedded.org/?p=bitbake.git&a=commit;h=470a160813ce6cf04f83258d46ded5c2ab8bc520

Author: Paul Eggleton <paul.eggleton@linux.intel.com>
Date:   Sun Jan  8 12:06:51 2012 +0000

bitbake-layers: close files in apply_append()

It's recommended practice to close files when finished with them and the
code in this function was not doing this.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

---

 bin/bitbake-layers |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Patch

diff --git a/bin/bitbake-layers b/bin/bitbake-layers
index b4c4127..b4cfd55 100755
--- a/bin/bitbake-layers
+++ b/bin/bitbake-layers
@@ -307,6 +307,8 @@  build results (as the layer priority order has effectively changed).
         recipefile.write('\n')
         recipefile.write('##### bbappended from %s #####\n' % self.get_append_layer(appendname))
         recipefile.writelines(appendfile.readlines())
+        recipefile.close()
+        appendfile.close()
 
     def do_show_appends(self, args):
         """list bbappend files and recipe files they apply to