diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 17:05:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 22:28:04 +0100 |
commit | 566628d8cd674a964d5824391cfd1585a1a22a87 (patch) | |
tree | 670366ee1492ff8bb18b9261dfab9d06c06b0a2d /meta/classes/package_deb.bbclass | |
parent | d2ef952851d9ef16875fdbbbc6ae6eb6cfc10cc0 (diff) | |
download | poky-566628d8cd674a964d5824391cfd1585a1a22a87.tar.gz |
class/lib: Fix up various file access methods
There are various bits of cruft that have built up around our file accesses. This patch
cleans some of them up, specifically:
* Remove pointless "from __builtin__ import file"
* Use open(), not file()
* Wrap file usage in a with container to ensure files are closed
* Add missing .close() calls in some cases
(From OE-Core rev: a43e0a8ecd0441131e929daf998c3cd454d9c8f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
-rw-r--r-- | meta/classes/package_deb.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 853b5ea8a3..313758f43f 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -227,7 +227,7 @@ python do_package_deb () { | |||
227 | bb.mkdirhier(controldir) | 227 | bb.mkdirhier(controldir) |
228 | os.chmod(controldir, 0755) | 228 | os.chmod(controldir, 0755) |
229 | try: | 229 | try: |
230 | ctrlfile = file(os.path.join(controldir, 'control'), 'wb') | 230 | ctrlfile = open(os.path.join(controldir, 'control'), 'w') |
231 | # import codecs | 231 | # import codecs |
232 | # ctrlfile = codecs.open("someFile", "w", "utf-8") | 232 | # ctrlfile = codecs.open("someFile", "w", "utf-8") |
233 | except OSError: | 233 | except OSError: |
@@ -355,7 +355,7 @@ python do_package_deb () { | |||
355 | if not scriptvar: | 355 | if not scriptvar: |
356 | continue | 356 | continue |
357 | try: | 357 | try: |
358 | scriptfile = file(os.path.join(controldir, script), 'w') | 358 | scriptfile = open(os.path.join(controldir, script), 'w') |
359 | except OSError: | 359 | except OSError: |
360 | bb.utils.unlockfile(lf) | 360 | bb.utils.unlockfile(lf) |
361 | raise bb.build.FuncFailed("unable to open %s script file for writing." % script) | 361 | raise bb.build.FuncFailed("unable to open %s script file for writing." % script) |
@@ -367,7 +367,7 @@ python do_package_deb () { | |||
367 | conffiles_str = localdata.getVar("CONFFILES", True) | 367 | conffiles_str = localdata.getVar("CONFFILES", True) |
368 | if conffiles_str: | 368 | if conffiles_str: |
369 | try: | 369 | try: |
370 | conffiles = file(os.path.join(controldir, 'conffiles'), 'w') | 370 | conffiles = open(os.path.join(controldir, 'conffiles'), 'w') |
371 | except OSError: | 371 | except OSError: |
372 | bb.utils.unlockfile(lf) | 372 | bb.utils.unlockfile(lf) |
373 | raise bb.build.FuncFailed("unable to open conffiles for writing.") | 373 | raise bb.build.FuncFailed("unable to open conffiles for writing.") |