mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
bitbake-dev: Fix cooker parser for cases there are no recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
@@ -906,7 +906,6 @@ class CookerExit(bb.event.Event):
|
|||||||
def __init__(self, d):
|
def __init__(self, d):
|
||||||
bb.event.Event.__init__(self, d)
|
bb.event.Event.__init__(self, d)
|
||||||
|
|
||||||
|
|
||||||
class CookerParser:
|
class CookerParser:
|
||||||
def __init__(self, cooker, filelist, masked):
|
def __init__(self, cooker, filelist, masked):
|
||||||
# Internal data
|
# Internal data
|
||||||
@@ -926,38 +925,40 @@ class CookerParser:
|
|||||||
|
|
||||||
def parse_next(self):
|
def parse_next(self):
|
||||||
print "Pointer %d" % self.pointer
|
print "Pointer %d" % self.pointer
|
||||||
f = self.filelist[self.pointer]
|
|
||||||
cooker = self.cooker
|
|
||||||
|
|
||||||
try:
|
if self.pointer < len(self.filelist):
|
||||||
fromCache, skip = cooker.bb_cache.loadData(f, cooker.configuration.data, cooker.status)
|
f = self.filelist[self.pointer]
|
||||||
if skip:
|
cooker = self.cooker
|
||||||
self.skipped += 1
|
|
||||||
bb.msg.debug(2, bb.msg.domain.Collection, "skipping %s" % f)
|
|
||||||
cooker.bb_cache.skip(f)
|
|
||||||
elif fromCache: self.cached += 1
|
|
||||||
else: self.parsed += 1
|
|
||||||
|
|
||||||
except IOError, e:
|
try:
|
||||||
self.error += 1
|
fromCache, skip = cooker.bb_cache.loadData(f, cooker.configuration.data, cooker.status)
|
||||||
cooker.bb_cache.remove(f)
|
if skip:
|
||||||
bb.msg.error(bb.msg.domain.Collection, "opening %s: %s" % (f, e))
|
self.skipped += 1
|
||||||
pass
|
bb.msg.debug(2, bb.msg.domain.Collection, "skipping %s" % f)
|
||||||
except KeyboardInterrupt:
|
cooker.bb_cache.skip(f)
|
||||||
cooker.bb_cache.remove(f)
|
elif fromCache: self.cached += 1
|
||||||
cooker.bb_cache.sync()
|
else: self.parsed += 1
|
||||||
raise
|
|
||||||
except Exception, e:
|
|
||||||
self.error += 1
|
|
||||||
cooker.bb_cache.remove(f)
|
|
||||||
bb.msg.error(bb.msg.domain.Collection, "%s while parsing %s" % (e, f))
|
|
||||||
except:
|
|
||||||
cooker.bb_cache.remove(f)
|
|
||||||
raise
|
|
||||||
finally:
|
|
||||||
bb.event.fire(bb.event.ParseProgress(cooker.configuration.event_data, self.cached, self.parsed, self.skipped, self.masked, self.error, self.total))
|
|
||||||
|
|
||||||
self.pointer += 1
|
except IOError, e:
|
||||||
|
self.error += 1
|
||||||
|
cooker.bb_cache.remove(f)
|
||||||
|
bb.msg.error(bb.msg.domain.Collection, "opening %s: %s" % (f, e))
|
||||||
|
pass
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
cooker.bb_cache.remove(f)
|
||||||
|
cooker.bb_cache.sync()
|
||||||
|
raise
|
||||||
|
except Exception, e:
|
||||||
|
self.error += 1
|
||||||
|
cooker.bb_cache.remove(f)
|
||||||
|
bb.msg.error(bb.msg.domain.Collection, "%s while parsing %s" % (e, f))
|
||||||
|
except:
|
||||||
|
cooker.bb_cache.remove(f)
|
||||||
|
raise
|
||||||
|
finally:
|
||||||
|
bb.event.fire(bb.event.ParseProgress(cooker.configuration.event_data, self.cached, self.parsed, self.skipped, self.masked, self.error, self.total))
|
||||||
|
|
||||||
|
self.pointer += 1
|
||||||
|
|
||||||
if self.pointer >= self.total:
|
if self.pointer >= self.total:
|
||||||
cooker.bb_cache.sync()
|
cooker.bb_cache.sync()
|
||||||
|
|||||||
Reference in New Issue
Block a user