diff options
| -rw-r--r-- | lib/bb/command.py | 3 | ||||
| -rw-r--r-- | lib/bb/cooker.py | 7 | ||||
| -rw-r--r-- | lib/bb/cookerdata.py | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/bb/command.py b/lib/bb/command.py index ab51d8e6cde..a919f58d248 100644 --- a/lib/bb/command.py +++ b/lib/bb/command.py @@ -310,7 +310,8 @@ class CommandsSync: def updateConfig(self, command, params): options = params[0] environment = params[1] - command.cooker.updateConfigOpts(options, environment) + cmdline = params[2] + command.cooker.updateConfigOpts(options, environment, cmdline) updateConfig.needconfig = False def parseConfiguration(self, command, params): diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 1283136b60b..45b5a61c466 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -192,6 +192,8 @@ class BBCooker: bb.parse.__mtime_cache = {} bb.parse.BBHandler.cached_statements = {} + self.ui_cmdline = None + self.initConfigurationData() # we log all events to a file if so directed @@ -360,6 +362,8 @@ class BBCooker: if consolelog: self.data.setVar("BB_CONSOLELOG", consolelog) + self.data.setVar('BB_CMDLINE', self.ui_cmdline) + # # Copy of the data store which has been expanded. # Used for firing events and accessing variables where expansion needs to be accounted for @@ -539,7 +543,8 @@ class BBCooker: self.handleCollections(self.data.getVar("BBFILE_COLLECTIONS")) - def updateConfigOpts(self, options, environment): + def updateConfigOpts(self, options, environment, cmdline): + self.ui_cmdline = cmdline clean = True for o in options: if o in ['prefile', 'postfile']: diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py index 6b850d3c21f..62aa055f5ca 100644 --- a/lib/bb/cookerdata.py +++ b/lib/bb/cookerdata.py @@ -79,7 +79,7 @@ class ConfigParameters(object): "prefile", "postfile", "tracking"]: options[o] = getattr(self.options, o) - ret, error = server.runCommand(["updateConfig", options, environment]) + ret, error = server.runCommand(["updateConfig", options, environment, sys.argv]) if error: raise Exception("Unable to update the server configuration with local parameters: %s" % error) |