bitbake: cooker: ensure monkey-patching in collect_bbfiles() gets undone on error
In collect_bbfiles() we're monkey-patching os.listdir in order to find which directories to watch, and then undoing that when we're finished - however if an exception occurred for any reason there was nothing to ensure the latter occurred. This may not have caused any issues, but as this kind of thing really ought to be secured using try...finally just in case, so do that. (Bitbake rev: 021e0eda63bd629af56b5e1c380c5f98868f7332) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0704bbdaeb
commit
9034b2c57b
|
@ -1894,25 +1894,25 @@ class CookerCollectFiles(object):
|
|||
return origlistdir(d)
|
||||
|
||||
os.listdir = ourlistdir
|
||||
|
||||
# Can't use set here as order is important
|
||||
newfiles = []
|
||||
for f in files:
|
||||
if os.path.isdir(f):
|
||||
dirfiles = self.find_bbfiles(f)
|
||||
for g in dirfiles:
|
||||
if g not in newfiles:
|
||||
newfiles.append(g)
|
||||
else:
|
||||
globbed = glob.glob(f)
|
||||
if not globbed and os.path.exists(f):
|
||||
globbed = [f]
|
||||
# glob gives files in order on disk. Sort to be deterministic.
|
||||
for g in sorted(globbed):
|
||||
if g not in newfiles:
|
||||
newfiles.append(g)
|
||||
|
||||
os.listdir = origlistdir
|
||||
try:
|
||||
# Can't use set here as order is important
|
||||
newfiles = []
|
||||
for f in files:
|
||||
if os.path.isdir(f):
|
||||
dirfiles = self.find_bbfiles(f)
|
||||
for g in dirfiles:
|
||||
if g not in newfiles:
|
||||
newfiles.append(g)
|
||||
else:
|
||||
globbed = glob.glob(f)
|
||||
if not globbed and os.path.exists(f):
|
||||
globbed = [f]
|
||||
# glob gives files in order on disk. Sort to be deterministic.
|
||||
for g in sorted(globbed):
|
||||
if g not in newfiles:
|
||||
newfiles.append(g)
|
||||
finally:
|
||||
os.listdir = origlistdir
|
||||
|
||||
bbmask = config.getVar('BBMASK')
|
||||
|
||||
|
|
Loading…
Reference in New Issue