Ignore command from included .isolate when the current one define a command.

Ignore command from included .isolate when the current one define a command.

Fix issue with command when evaluating preference; since the whole tree was
flattened, there was no information about which combination should take
precendence.

The problem wasn't with the 'or' operator but with the selection of the most
appropriate 'command'.

R=vadimsh@chromium.org
BUG=swarming:211

Committed: https://code.google.com/p/swarming/source/detail?repo=client&r=b61a1802f5ef4bb8c7b81060cc80add47e6cf302

[vadimsh, 2015-03-02 23:39:05]

Sorry, overlooked this CL somehow.

So if root isolate contains "command" var in unreachable conditional section, it
will cause "command" to be None, even though included isolates define it? This
seems counterintuitive to me. 

but lgtm if it fixes the bug and doesn't break anything else...

https://codereview.appspot.com/208830043/diff/1/isolate_format.py
File isolate_format.py (right):

https://codereview.appspot.com/208830043/diff/1/isolate_format.py#newcode628
isolate_format.py:628: # command is the one with the smallest number of checks,
not the one in
this comment doesn't make sense to me... Where is "number of checks" evaluated?

[M-A, 2015-03-09 19:16:57]

https://codereview.appspot.com/208830043/diff/1/isolate_format.py
File isolate_format.py (right):

https://codereview.appspot.com/208830043/diff/1/isolate_format.py#newcode628
isolate_format.py:628: # command is the one with the smallest number of checks,
not the one in
On 2015/03/02 23:39:05, vadimsh wrote:
> this comment doesn't make sense to me... Where is "number of checks"
evaluated? 

Reworded. It's not awesome in any way but it'll get us going.

[M-A, 2015-03-09 19:19:04]

Committed patchset #2 (id:20001) manually as
b61a1802f5ef4bb8c7b81060cc80add47e6cf302 (presubmit successful).