diff options
| author | Michael E Brown <mebrown@michaels-house.net> | 2007-11-17 23:45:25 -0600 |
|---|---|---|
| committer | Michael E Brown <mebrown@michaels-house.net> | 2007-11-17 23:45:25 -0600 |
| commit | 6dcdd84f3565634cd99ff5c2641ee1f967956b27 (patch) | |
| tree | 0a0424d67123fa34672f6cf684ce13bf5bbd437f /src | |
| parent | 19c6b60285ccb992ca458d86c240fba21f72528b (diff) | |
| download | mock-6dcdd84f3565634cd99ff5c2641ee1f967956b27.tar.gz mock-6dcdd84f3565634cd99ff5c2641ee1f967956b27.tar.xz mock-6dcdd84f3565634cd99ff5c2641ee1f967956b27.zip | |
move ctypes check down a level into setup_default_config_opts function.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/mock.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mock.py b/src/mock.py index fa90d36..eefff66 100755 --- a/src/mock.py +++ b/src/mock.py @@ -30,12 +30,6 @@ import sys import time from optparse import OptionParser -try: - import ctypes - have_ctypes = 1 -except ImportError: - have_ctypes = 0 - # all of the variables below are substituted by the build system __VERSION__="0.8.8" SYSCONFDIR="/usr/local/etc" @@ -124,9 +118,12 @@ def setup_default_config_opts(config_opts): config_opts['build_log_fmt_name'] = "unadorned" config_opts['root_log_fmt_name'] = "detailed" config_opts['state_log_fmt_name'] = "state" - config_opts['internal_setarch'] = False - if have_ctypes: + + try: + import ctypes config_opts['internal_setarch'] = True + except ImportError: + config_opts['internal_setarch'] = False # cleanup_on_* only take effect for separate --resultdir # config_opts provides fine-grained control. cmdline only has big hammer |