From 1b42be673b2cd237ce873df9f4b0b339aab9518a Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Thu, 29 Nov 2012 17:15:35 +0000 Subject: Merge system-3.4 and 3.6 --- (limited to 'devbot/config.py') diff --git a/devbot/config.py b/devbot/config.py index 259c4f2..513fe10 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -233,8 +233,6 @@ def _filter_if(item): return eval(item["if"], globals) def load_checks(): - version = distro.get_distro_info().system_version - checks = [] for file in dep_files: path = os.path.join(config_dir, "deps", "%s.json" % file) @@ -243,11 +241,7 @@ def load_checks(): return filter(_filter_if, checks) def load_modules(): - version = distro.get_distro_info().system_version - - module_files = ["system-%s.json" % version, - "sugar.json", - "activities.json"] + global module_files modules = [] -- cgit v0.9.1