diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-29 17:15:35 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-29 17:15:35 (GMT) |
commit | 1b42be673b2cd237ce873df9f4b0b339aab9518a (patch) | |
tree | d4d7293ef51bfdbf1181a8772fa9e856207a8771 /commands/common.py | |
parent | 2ec41693aeefe3c9ce78ff3654a11ff6bd2b7123 (diff) |
Merge system-3.4 and 3.6
Diffstat (limited to 'commands/common.py')
-rw-r--r-- | commands/common.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/commands/common.py b/commands/common.py index 677417a..38c3418 100644 --- a/commands/common.py +++ b/commands/common.py @@ -6,9 +6,7 @@ tests_dir = os.path.join(base_dir, "tests") sys.path.append(base_dir) -from devbot import system from devbot import config -from devbot import distro from devbot import command def setup(): @@ -29,12 +27,7 @@ def setup(): config.set_prefs_path(os.path.join(base_dir, "prefs")) config.set_logs_dir(logs_dir) - os.environ["SB_LOGS_DIR"] = logs_dir - os.environ["SB_LIBEXEC_DIR"] = config.libexec_dir - - version = distro.get_distro_info().system_version - - module_files = ["system-%s.json" % version, + module_files = ["system.json", "sugar.json", "activities.json"] |