jhbuild r2228 - in trunk: . jhbuild/buildbot jhbuild/commands

[fpeters svn gnome org]

Author: fpeters
Date: Thu Aug 14 08:51:07 2008
New Revision: 2228
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2228&view=rev

Log:
* jhbuild/buildbot/steps.py, jhbuild/commands/bot.py: make the jhbuild
config instance accessible to all buildbot stuff (necessary to get
slaves with jhbuildrc != ~/.jhbuildrc working).



Modified:
   trunk/ChangeLog
   trunk/jhbuild/buildbot/steps.py
   trunk/jhbuild/commands/bot.py

Modified: trunk/jhbuild/buildbot/steps.py
==============================================================================
--- trunk/jhbuild/buildbot/steps.py	(original)
+++ trunk/jhbuild/buildbot/steps.py	Thu Aug 14 08:51:07 2008
@@ -102,6 +102,7 @@
         command = ['jhbuild']
         if (moduleset is not None):
             command += ['--moduleset='+moduleset]
+        command += ['-f', jhbuild_config.filename]
         command += ['bot', '--step', stage, module]
         self.name =module + ' ' + stage
         self.description = [module + ' ' + stage + ' (running)']
@@ -130,6 +131,7 @@
         command = ["jhbuild"]
         if (moduleset is not None):
             command += ['--moduleset='+moduleset]
+        command += ['-f', jhbuild_config.filename]
         command += ['bot', '--step', 'run', '--in-builddir', module,
                 '--', action]
         self.name=module+" "+" ".join(action)

Modified: trunk/jhbuild/commands/bot.py
==============================================================================
--- trunk/jhbuild/commands/bot.py	(original)
+++ trunk/jhbuild/commands/bot.py	Thu Aug 14 08:51:07 2008
@@ -123,6 +123,10 @@
             except ImportError:
                 raise FatalError(_('buildbot and twisted not found, run jhbuild bot --setup'))
 
+        # make jhbuild config file accessible to buildbot files
+        # (master.cfg , steps.py, etc.)
+        __builtin__.__dict__['jhbuild_config'] = config
+
         if options.start:
             return self.start(config)
         if options.step:
@@ -231,9 +235,6 @@
             os.makedirs(os.path.join(basedir, 'builddir'))
         master_cfg_path = os.path.join(basedir, 'master.cfg')
 
-        # make jhbuild config file accessible in master.cfg
-        __builtin__.__dict__['jhbuild_config'] = config
-
         BuildMaster(basedir, master_cfg_path).setServiceParent(application)
 
         JhBuildbotApplicationRunner.application = application