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_ipk.bbclass | |
parent | d2ef952851d9ef16875fdbbbc6ae6eb6cfc10cc0 (diff) | |
download | ast2050-yocto-poky-566628d8cd674a964d5824391cfd1585a1a22a87.zip ast2050-yocto-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_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 5873f71..f6797ad 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -268,7 +268,7 @@ python do_package_ipk () { controldir = os.path.join(root, 'CONTROL') bb.mkdirhier(controldir) try: - ctrlfile = file(os.path.join(controldir, 'control'), 'w') + ctrlfile = open(os.path.join(controldir, 'control'), 'w') except OSError: bb.utils.unlockfile(lf) raise bb.build.FuncFailed("unable to open control file for writing.") @@ -369,7 +369,7 @@ python do_package_ipk () { 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) @@ -380,7 +380,7 @@ python do_package_ipk () { 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.") |