[jhbuild] Don't get_system_modules if check_sysdeps is false (GNOME bug 678361)
- From: Craig Keogh <cskeogh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Don't get_system_modules if check_sysdeps is false (GNOME bug 678361)
- Date: Mon, 23 Jul 2012 11:44:16 +0000 (UTC)
commit 5e536550fe3118b4ababc77ad9ed9fb1f02fd4c1
Author: Craig Keogh <cskeogh adam com au>
Date: Mon Jul 23 21:11:59 2012 +0930
Don't get_system_modules if check_sysdeps is false (GNOME bug 678361)
in tinderbox.py.
jhbuild/commands/tinderbox.py | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/jhbuild/commands/tinderbox.py b/jhbuild/commands/tinderbox.py
index 0015b38..84b3706 100644
--- a/jhbuild/commands/tinderbox.py
+++ b/jhbuild/commands/tinderbox.py
@@ -90,16 +90,16 @@ class cmd_tinderbox(BuildCommand):
if not module_list:
raise FatalError(_('%s not in module list') % options.startat)
- module_state = module_set.get_system_modules(full_module_list)
- if (config.check_sysdeps
- and not self.required_system_dependencies_installed(module_state)):
- self.print_system_dependencies(module_state)
- raise FatalError(_('Required system dependencies not installed. '
- 'Install using the command %(cmd)s or to '
- 'ignore system dependencies use command-line '
- 'option %(opt)s' \
- % {'cmd' : "'jhbuild sysdeps --install'",
- 'opt' : '--nodeps'}))
+ if config.check_sysdeps:
+ module_state = module_set.get_system_modules(full_module_list)
+ if not self.required_system_dependencies_installed(module_state):
+ self.print_system_dependencies(module_state)
+ raise FatalError(_('Required system dependencies not installed.'
+ ' Install using the command %(cmd)s or to '
+ 'ignore system dependencies use command-line'
+ ' option %(opt)s' \
+ % {'cmd' : "'jhbuild sysdeps --install'",
+ 'opt' : '--nodeps'}))
build = jhbuild.frontends.get_buildscript(config, module_list, module_set=module_set)
return build.build()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]