summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cookerdata.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:04:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:03 +0100
commit5759039a89674c1e11b3d73cd6487f4586d25a73 (patch)
tree2021e328c88b221a71dd385a303b67f266fa0ab2 /bitbake/lib/bb/cookerdata.py
parent313bf30db7bda51a061bae9c8d9c489e4a7c0167 (diff)
downloadpoky-5759039a89674c1e11b3d73cd6487f4586d25a73.tar.gz
bitbake: cooker: Handle datastore tracking for showEnvironment server side only
The current passing of "tracking" backwards and forwards, client to server is ugly and complex and error prone. Instead, set this during showEnvironment commands triggering a reset there if/as required. (Bitbake rev: 9dc7f384db0479569ff93a76a623d5395fecaf47) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cookerdata.py')
-rw-r--r--bitbake/lib/bb/cookerdata.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 55c6ea83cb..197db6215e 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -41,10 +41,6 @@ class ConfigParameters(object):
41 41
42 self.options.pkgs_to_build = targets or [] 42 self.options.pkgs_to_build = targets or []
43 43
44 self.options.tracking = False
45 if hasattr(self.options, "show_environment") and self.options.show_environment:
46 self.options.tracking = True
47
48 for key, val in self.options.__dict__.items(): 44 for key, val in self.options.__dict__.items():
49 setattr(self, key, val) 45 setattr(self, key, val)
50 46
@@ -76,7 +72,7 @@ class ConfigParameters(object):
76 for o in ["abort", "tryaltconfigs", "force", "invalidate_stamp", 72 for o in ["abort", "tryaltconfigs", "force", "invalidate_stamp",
77 "verbose", "debug", "dry_run", "dump_signatures", 73 "verbose", "debug", "dry_run", "dump_signatures",
78 "debug_domains", "extra_assume_provided", "profile", 74 "debug_domains", "extra_assume_provided", "profile",
79 "prefile", "postfile", "tracking", "server_timeout"]: 75 "prefile", "postfile", "server_timeout"]:
80 options[o] = getattr(self.options, o) 76 options[o] = getattr(self.options, o)
81 77
82 ret, error = server.runCommand(["updateConfig", options, environment, sys.argv]) 78 ret, error = server.runCommand(["updateConfig", options, environment, sys.argv])
@@ -158,7 +154,6 @@ class CookerConfiguration(object):
158 if key in parameters.options.__dict__: 154 if key in parameters.options.__dict__:
159 setattr(self, key, parameters.options.__dict__[key]) 155 setattr(self, key, parameters.options.__dict__[key])
160 self.env = parameters.environment.copy() 156 self.env = parameters.environment.copy()
161 self.tracking = parameters.tracking
162 157
163 def setServerRegIdleCallback(self, srcb): 158 def setServerRegIdleCallback(self, srcb):
164 self.server_register_idlecallback = srcb 159 self.server_register_idlecallback = srcb