Index: buildbot/cbuildbot_stages.py |
diff --git a/buildbot/cbuildbot_stages.py b/buildbot/cbuildbot_stages.py |
index 197a50bf0538cd024460df11592fb229698f92bc..6997755b1a64658cc770dea264eaaa452d0053b4 100644 |
--- a/buildbot/cbuildbot_stages.py |
+++ b/buildbot/cbuildbot_stages.py |
@@ -319,10 +319,18 @@ class BuildTargetStage(BuilderStage): |
BuilderStage.new_binhost = self._GetPortageEnvVar(_FULL_BINHOST) |
emptytree = (BuilderStage.old_binhost and |
BuilderStage.old_binhost != BuilderStage.new_binhost) |
- |
+ env=[] |
+ if self._build_config['useflags']: |
+ if isinstance(self._build_config['useflags'], basestring): |
sosa
2011/04/01 00:01:11
Choose one or the other ...i.e. allow string or ar
Peter Mayo
2011/04/01 02:46:05
I think array may eventually be required, but sinc
|
+ env.append('USE=%s' % self._build_config['useflags']) |
+ else: |
+ env.append('USE="%s"' % ' '.join(self._build_config['useflags'])) |
+ |
+ # TODO(petermayo): Add other extra env variable when asked. |
sosa
2011/04/01 00:01:11
Remove this TODO
Peter Mayo
2011/04/01 02:46:05
Done.
|
commands.Build( |
self._build_root, emptytree, usepkg=self._build_config['usepkg'], |
- build_autotest=(self._build_config['vm_tests'] and self._options.tests)) |
+ build_autotest=(self._build_config['vm_tests'] and self._options.tests), |
+ extra_env=env) |
# TODO(sosa): Do this optimization in a better way. |
if self._build_type == 'full': |