From 1b42be673b2cd237ce873df9f4b0b339aab9518a Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Thu, 29 Nov 2012 17:15:35 +0000
Subject: Merge system-3.4 and 3.6

---
(limited to 'commands/common.py')

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"]
 
--
cgit v0.9.1