diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2011-06-14 15:12:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-08 17:38:42 +0100 |
commit | 4fadc30b92d42523fee013c168d47bc93dfe4fbd (patch) | |
tree | e37df0b79a8d6e20fd8b93bf065c9cd7bb033a5a /bitbake/lib/bb/cooker.py | |
parent | 18ce7e2ef3a3b65bc0abca4f0135005249e6d2ca (diff) | |
download | poky-4fadc30b92d42523fee013c168d47bc93dfe4fbd.tar.gz |
bitbake cooker/ui: handle cmd line parsing result by individual UI.
Changed the return result of "getCmdLineAction" to a dictionary
{'action', 'msg'} to allow the individual UI decide how to handle the
cmd line parsing result.
(Bitbake rev: 521909d1350a415d19516aa1710041e30950c7cc)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index ecf20dcf68..1f6e093efb 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -178,41 +178,39 @@ class BBCooker: | |||
178 | 178 | ||
179 | def parseCommandLine(self): | 179 | def parseCommandLine(self): |
180 | # Parse any commandline into actions | 180 | # Parse any commandline into actions |
181 | self.commandlineAction = {'action':None, 'msg':None} | ||
181 | if self.configuration.show_environment: | 182 | if self.configuration.show_environment: |
182 | self.commandlineAction = None | ||
183 | |||
184 | if 'world' in self.configuration.pkgs_to_build: | 183 | if 'world' in self.configuration.pkgs_to_build: |
185 | buildlog.error("'world' is not a valid target for --environment.") | 184 | self.commandlineAction['msg'] = "'world' is not a valid target for --environment." |
186 | if 'universe' in self.configuration.pkgs_to_build: | 185 | elif 'universe' in self.configuration.pkgs_to_build: |
187 | buildlog.error("'universe' is not a valid target for --environment.") | 186 | self.commandlineAction['msg'] = "'universe' is not a valid target for --environment." |
188 | elif len(self.configuration.pkgs_to_build) > 1: | 187 | elif len(self.configuration.pkgs_to_build) > 1: |
189 | buildlog.error("Only one target can be used with the --environment option.") | 188 | self.commandlineAction['msg'] = "Only one target can be used with the --environment option." |
190 | elif self.configuration.buildfile and len(self.configuration.pkgs_to_build) > 0: | 189 | elif self.configuration.buildfile and len(self.configuration.pkgs_to_build) > 0: |
191 | buildlog.error("No target should be used with the --environment and --buildfile options.") | 190 | self.commandlineAction['msg'] = "No target should be used with the --environment and --buildfile options." |
192 | elif len(self.configuration.pkgs_to_build) > 0: | 191 | elif len(self.configuration.pkgs_to_build) > 0: |
193 | self.commandlineAction = ["showEnvironmentTarget", self.configuration.pkgs_to_build] | 192 | self.commandlineAction['action'] = ["showEnvironmentTarget", self.configuration.pkgs_to_build] |
194 | else: | 193 | else: |
195 | self.commandlineAction = ["showEnvironment", self.configuration.buildfile] | 194 | self.commandlineAction['action'] = ["showEnvironment", self.configuration.buildfile] |
196 | elif self.configuration.buildfile is not None: | 195 | elif self.configuration.buildfile is not None: |
197 | self.commandlineAction = ["buildFile", self.configuration.buildfile, self.configuration.cmd] | 196 | self.commandlineAction['action'] = ["buildFile", self.configuration.buildfile, self.configuration.cmd] |
198 | elif self.configuration.revisions_changed: | 197 | elif self.configuration.revisions_changed: |
199 | self.commandlineAction = ["compareRevisions"] | 198 | self.commandlineAction['action'] = ["compareRevisions"] |
200 | elif self.configuration.show_versions: | 199 | elif self.configuration.show_versions: |
201 | self.commandlineAction = ["showVersions"] | 200 | self.commandlineAction['action'] = ["showVersions"] |
202 | elif self.configuration.parse_only: | 201 | elif self.configuration.parse_only: |
203 | self.commandlineAction = ["parseFiles"] | 202 | self.commandlineAction['action'] = ["parseFiles"] |
204 | elif self.configuration.dot_graph: | 203 | elif self.configuration.dot_graph: |
205 | if self.configuration.pkgs_to_build: | 204 | if self.configuration.pkgs_to_build: |
206 | self.commandlineAction = ["generateDotGraph", self.configuration.pkgs_to_build, self.configuration.cmd] | 205 | self.commandlineAction['action'] = ["generateDotGraph", self.configuration.pkgs_to_build, self.configuration.cmd] |
207 | else: | 206 | else: |
208 | self.commandlineAction = None | 207 | self.commandlineAction['msg'] = "Please specify a package name for dependency graph generation." |
209 | buildlog.error("Please specify a package name for dependency graph generation.") | ||
210 | else: | 208 | else: |
211 | if self.configuration.pkgs_to_build: | 209 | if self.configuration.pkgs_to_build: |
212 | self.commandlineAction = ["buildTargets", self.configuration.pkgs_to_build, self.configuration.cmd] | 210 | self.commandlineAction['action'] = ["buildTargets", self.configuration.pkgs_to_build, self.configuration.cmd] |
213 | else: | 211 | else: |
212 | #self.commandlineAction['msg'] = "Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information." | ||
214 | self.commandlineAction = None | 213 | self.commandlineAction = None |
215 | buildlog.error("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") | ||
216 | 214 | ||
217 | def runCommands(self, server, data, abort): | 215 | def runCommands(self, server, data, abort): |
218 | """ | 216 | """ |