[Lsb-messages] /var/www/bzr/lsb/devel/buildbot-config r233: Change the way the environment gets set in LSBConfigureAppbat.

Jeff Licquia licquia at linuxfoundation.org
Fri Mar 23 15:19:29 UTC 2012


------------------------------------------------------------
revno: 233
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: buildbot-config
timestamp: Fri 2012-03-23 11:19:29 -0400
message:
  Change the way the environment gets set in LSBConfigureAppbat.
modified:
  lfbuildbot.py
-------------- next part --------------
=== modified file 'lfbuildbot.py'
--- a/lfbuildbot.py	2012-03-22 20:56:02 +0000
+++ b/lfbuildbot.py	2012-03-23 15:19:29 +0000
@@ -309,15 +309,15 @@
         kwargs["makeargs"] = False
         LSBBuildCommand.__init__(self, **kwargs)
 
-    def start(self):
-        self._set_build_props()
+    def setupEnvironment(self, cmd):
+        LSBBuildCommand.setupEnvironment(self, cmd)
 
+        if cmd.args['env'] is None:
+            cmd.args['env'] = {}
         for env_item in self._get_make_args():
             if "=" in env_item:
                 (name, value) = env_item.split("=")
-                self.build.slaveEnvironment[name] = value
-
-        LSBBuildCommand.start(self)
+                cmd.args['env'][name] = value
 
 # Reload the SDK.  This class figures out what SDK we need (devel, stable,
 # or beta) and installs it.



More information about the lsb-messages mailing list