[jhbuild] Correctly handle check_sysdeps in config file (GNOME bug 678132)
- From: Craig Keogh <cskeogh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Correctly handle check_sysdeps in config file (GNOME bug 678132)
- Date: Fri, 15 Jun 2012 10:33:58 +0000 (UTC)
commit d6bbb10d6230b1d8afe86f613f6fcb21fe91cdee
Author: Craig Keogh <cskeogh adam com au>
Date: Fri Jun 15 16:40:22 2012 +0930
Correctly handle check_sysdeps in config file (GNOME bug 678132)
jhbuild/commands/base.py | 2 +-
jhbuild/config.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/commands/base.py b/jhbuild/commands/base.py
index daeab73..799bc96 100644
--- a/jhbuild/commands/base.py
+++ b/jhbuild/commands/base.py
@@ -214,7 +214,7 @@ class cmd_build(BuildCommand):
action='store', dest='min_age', default=None,
help=_('skip modules installed less than the given time ago')),
make_option('--nodeps',
- action='store_false', dest='check_sysdeps', default=True,
+ action='store_false', dest='check_sysdeps', default=None,
help=_('ignore missing system dependencies')),
])
diff --git a/jhbuild/config.py b/jhbuild/config.py
index 3f082dd..71812c4 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -626,7 +626,7 @@ class Config:
except ValueError:
raise FatalError(_('Failed to parse \'min_age\' relative '
'time'))
- if hasattr(options, 'check_sysdeps'):
+ if hasattr(options, 'check_sysdeps') and options.check_sysdeps:
self.check_sysdeps = options.check_sysdeps
def __setattr__(self, k, v):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]