[jhbuild] Fix testmodule for jhbuild autobuild
- From: Frederic Peters <fpeters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Fix testmodule for jhbuild autobuild
- Date: Wed, 28 Apr 2010 11:22:20 +0000 (UTC)
commit 01d01a79de9fa0907796899a7c4f1cdb98e7cb6f
Author: Jon TURNEY <jon turney dronecode org uk>
Date: Fri Mar 19 19:54:29 2010 +0000
Fix testmodule for jhbuild autobuild
If the moduleset contains a TestModule, jhbuild autobuild dies
Traceback (most recent call last):
File "/usr/local/bin/jhbuild", line 31, in <module>
jhbuild.main.main(sys.argv[1:])
File "/usr/local/jhbuild/jhbuild/main.py", line 136, in main
rc = jhbuild.commands.run(command, config, args, help=lambda: print_help(parser))
File "/usr/local/jhbuild/jhbuild/commands/__init__.py", line 123, in run
return cmd.execute(config, args, help)
File "/usr/local/jhbuild/jhbuild/commands/__init__.py", line 52, in execute
return self.run(config, options, args, help)
File "/usr/local/jhbuild/jhbuild/commands/autobuild.py", line 89, in run
return build.build()
File "/usr/local/jhbuild/jhbuild/frontends/buildscript.py", line 149, in build
self.end_phase(module.name, phase, error)
File "/usr/local/jhbuild/jhbuild/frontends/autobuild.py", line 259, in end_phase
self.modules = jhbuild.moduleset.load_tests(self.config)
File "/usr/local/jhbuild/jhbuild/moduleset.py", line 301, in load_tests
if module.__class__ == testmodule.TestModule:
NameError: global name 'testmodule' is not defined
jhbuild/moduleset.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index c69f4dd..3389713 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -35,6 +35,7 @@ from jhbuild import modtypes
from jhbuild.versioncontrol import get_repo_type
from jhbuild.utils import httpcache
from jhbuild.utils.cmds import get_output
+from jhbuild.modtypes.testmodule import TestModule
__all__ = ['load', 'load_tests']
@@ -298,7 +299,7 @@ def load_tests (config, uri=None):
ms = load (config, uri)
ms_tests = ModuleSet(config = config)
for app, module in ms.modules.iteritems():
- if module.__class__ == testmodule.TestModule:
+ if module.__class__ == TestModule:
ms_tests.modules[app] = module
return ms_tests
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]