mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: daemonize/build: Clean up /dev/null fd handling

Browse Source 
At the end of bitbake selftest we see:

sys:1: ResourceWarning: unclosed file <_io.TextIOWrapper name='/dev/null' mode='r+' encoding='UTF-8'>

Clean up the /dev/null handling to drop the unused entry in build.by and
ensure the other open() calls are cleaned up.

NULL was unused since http://git.yoctoproject.org/cgit.cgi/poky/commit/bitbake/lib/bb/build.py?id=4a081b5a52e3d27da8d4b062f3fda292e8d8fb0a
back in 2012.

(Bitbake rev: e72be96cfa9f05fda5f420c7cfa8bcfa9304b884)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2018-09-21 20:14:03 -07:00
parent 7be6abc98d
commit c942230eee
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bitbake/lib/bb/build.py
View File

@@ -41,8 +41,6 @@ from bb import data, event, utils
bblogger = logging.getLogger('BitBake') bblogger = logging.getLogger('BitBake')
logger = logging.getLogger('BitBake.Build') logger = logging.getLogger('BitBake.Build')
NULL = open(os.devnull, 'r+')
__mtime_cache = {} __mtime_cache = {}
def cached_mtime_noerror(f): def cached_mtime_noerror(f):
@@ -533,7 +531,6 @@ def _exec_task(fn, task, d, quieterr):
self.triggered = True self.triggered = True
# Handle logfiles # Handle logfiles
si = open('/dev/null', 'r')
try: try:
bb.utils.mkdirhier(os.path.dirname(logfn)) bb.utils.mkdirhier(os.path.dirname(logfn))
logfile = open(logfn, 'w') logfile = open(logfn, 'w')
@@ -547,7 +544,8 @@ def _exec_task(fn, task, d, quieterr):
ose = [os.dup(sys.stderr.fileno()), sys.stderr.fileno()] ose = [os.dup(sys.stderr.fileno()), sys.stderr.fileno()]
# Replace those fds with our own # Replace those fds with our own
os.dup2(si.fileno(), osi[1]) with open('/dev/null', 'r') as si:
os.dup2(si.fileno(), osi[1])
os.dup2(logfile.fileno(), oso[1]) os.dup2(logfile.fileno(), oso[1])
os.dup2(logfile.fileno(), ose[1]) os.dup2(logfile.fileno(), ose[1])
@@ -608,7 +606,6 @@ def _exec_task(fn, task, d, quieterr):
os.close(osi[0]) os.close(osi[0])
os.close(oso[0]) os.close(oso[0])
os.close(ose[0]) os.close(ose[0])
si.close()
logfile.close() logfile.close()
if os.path.exists(logfn) and os.path.getsize(logfn) == 0: if os.path.exists(logfn) and os.path.getsize(logfn) == 0:

4
bitbake/lib/bb/daemonize.py
View File

@@ -65,8 +65,8 @@ def createDaemon(function, logfile):
# The second child. # The second child.
# Replace standard fds with our own # Replace standard fds with our own
si = open('/dev/null', 'r') with open('/dev/null', 'r') as si:
os.dup2(si.fileno(), sys.stdin.fileno()) os.dup2(si.fileno(), sys.stdin.fileno())
try: try:
so = open(logfile, 'a+') so = open(logfile, 'a+')