diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-03-07 19:05:11 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-03-07 19:05:11 -0300 |
commit | 751638b4eb8208e1eaa1beaaed284da6b412bca7 (patch) | |
tree | 58a517d1f22a45a581fcca3ff2766663974de3fa /src/leap/config/pluggableconfig.py | |
parent | 6d6600a495ef48e0f04cb78bedca8fb913bada2a (diff) |
Change asserts for a custom leap_assert method
Also:
- Make SRPAuth and the Bootstrappers be a QObject instead of a QThread
so we can use them inside another more generic thread
- Add a generic CheckerThread that runs checks or whatever operation
as long as it returns a boolean value
- Closes the whole application if the wizard is rejected at the first
run
- Do not fail when the config directory doesn't exist
- Set the wizard pixmap logo as LEAP's logo
- Improve wizard checks
- Make SRPRegister play nice with the CheckerThread
Diffstat (limited to 'src/leap/config/pluggableconfig.py')
-rw-r--r-- | src/leap/config/pluggableconfig.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/config/pluggableconfig.py b/src/leap/config/pluggableconfig.py index 64aa05cc..5ed83b3f 100644 --- a/src/leap/config/pluggableconfig.py +++ b/src/leap/config/pluggableconfig.py @@ -28,6 +28,8 @@ import urlparse import jsonschema #from leap.base.util.translations import LEAPTranslatable +from leap.util.check import leap_assert + logger = logging.getLogger(__name__) @@ -378,7 +380,7 @@ class PluggableConfig(object): # XXX cleanup this! if fromfile: - assert os.path.exists(fromfile) + leap_assert(os.path.exists(fromfile)) if not format: format = self.filename2format(fromfile) |