diff options
Diffstat (limited to 'bitbake/lib/bb/shell.py')
| -rw-r--r-- | bitbake/lib/bb/shell.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/bitbake/lib/bb/shell.py b/bitbake/lib/bb/shell.py index f9ca9d5bd3..3319e2d1cc 100644 --- a/bitbake/lib/bb/shell.py +++ b/bitbake/lib/bb/shell.py @@ -180,11 +180,9 @@ class BitBakeShellCommands: last_exception = Providers.NoProvider except runqueue.TaskFailure as fnids: - for fnid in fnids: - print("ERROR: '%s' failed" % td.fn_index[fnid]) last_exception = runqueue.TaskFailure - except build.EventException as e: + except build.FuncFailed as e: print("ERROR: Couldn't build '%s'" % names) last_exception = e @@ -247,7 +245,7 @@ class BitBakeShellCommands: cooker.buildFile(bf, cmd) except parse.ParseError: print("ERROR: Unable to open or parse '%s'" % bf) - except build.EventException as e: + except build.FuncFailed as e: print("ERROR: Couldn't build '%s'" % name) last_exception = e @@ -274,9 +272,7 @@ class BitBakeShellCommands: bbfile = params[0] print("SHELL: Parsing '%s'" % bbfile) parse.update_mtime( bbfile ) - cooker.bb_cache.cacheValidUpdate(bbfile) - fromCache = cooker.bb_cache.loadData(bbfile, cooker.configuration.data, cooker.status) - cooker.bb_cache.sync() + cooker.parser.reparse(bbfile) if False: #fromCache: print("SHELL: File has not been updated, not reparsing") else: @@ -445,7 +441,7 @@ SRC_URI = "" name, var = params bbfile = self._findProvider( name ) if bbfile is not None: - the_data = cooker.bb_cache.loadDataFull(bbfile, cooker.configuration.data) + the_data = cache.Cache.loadDataFull(bbfile, cooker.configuration.data) value = the_data.getVar( var, 1 ) print(value) else: |