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:25:31 +0100 |
commit | a43e0a8ecd0441131e929daf998c3cd454d9c8f3 (patch) | |
tree | 69be538a129e3f9e985aa65d07005bf067371aa5 /meta/classes/package_deb.bbclass | |
parent | 4808629faa1222b31f92a3e410e06adb8e081293 (diff) | |
download | openembedded-core-contrib-a43e0a8ecd0441131e929daf998c3cd454d9c8f3.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
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 () { bb.mkdirhier(controldir) os.chmod(controldir, 0755) try: - ctrlfile = file(os.path.join(controldir, 'control'), 'wb') + ctrlfile = open(os.path.join(controldir, 'control'), 'w') # import codecs # ctrlfile = codecs.open("someFile", "w", "utf-8") except OSError: @@ -355,7 +355,7 @@ python do_package_deb () { if not scriptvar: continue try: - scriptfile = file(os.path.join(controldir, script), 'w') + scriptfile = open(os.path.join(controldir, script), 'w') except OSError: bb.utils.unlockfile(lf) raise bb.build.FuncFailed("unable to open %s script file for writing." % script) @@ -367,7 +367,7 @@ python do_package_deb () { conffiles_str = localdata.getVar("CONFFILES", True) if conffiles_str: try: - conffiles = file(os.path.join(controldir, 'conffiles'), 'w') + conffiles = open(os.path.join(controldir, 'conffiles'), 'w') except OSError: bb.utils.unlockfile(lf) raise bb.build.FuncFailed("unable to open conffiles for writing.") |