diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-17 20:06:40 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-17 20:06:40 (GMT) |
commit | ff6d17f224589ca13d85ffbc0e6c732646487a6f (patch) | |
tree | 5f98563879ead2d425cb2b174293b77c36c4811f /devbot | |
parent | dfaf836ebd3f1f4807b147d8af5ca3fb8895d581 (diff) |
Move files lists out of devbot
Diffstat (limited to 'devbot')
-rw-r--r-- | devbot/config.py | 26 | ||||
-rw-r--r-- | devbot/system.py | 2 |
2 files changed, 20 insertions, 8 deletions
diff --git a/devbot/config.py b/devbot/config.py index 4249dca..bd25cf7 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -14,6 +14,9 @@ devbot_dir = None share_dir = None bin_dir = None etc_dir = None +dep_files = None +module_files = None +package_files = None use_lib64 = os.uname()[4] == "x86_64" if use_lib64: @@ -60,6 +63,18 @@ def set_commands_dir(dir): global commands_dir commands_dir = dir +def set_dep_files(files): + global dep_files + dep_files = files + +def set_module_files(files): + global module_files + module_files = files + +def set_package_files(files): + global package_files + package_files = files + def get_module_source_dir(module): return os.path.join(source_dir, module["name"]) @@ -67,7 +82,9 @@ def get_module_build_dir(module): return os.path.join(build_dir, module["name"]) def load_packages(): - return _load_deps_json("packages-%s" % distro.get_system_version()) + packages = [] + for package_file in package_files: + packages.extend(_load_deps_json(package_file)) def load_prerequisites(): return _load_deps_json("prerequisites") @@ -75,13 +92,8 @@ def load_prerequisites(): def load_checks(): version = distro.get_system_version() - check_files = ["system", - "sugar-build", - "sugar-buildtime-%s" % version, - "sugar-runtime-%s" % version] - checks = [] - for check_file in check_files: + for check_file in dep_files: checks.extend(_load_deps_json(check_file)) return checks diff --git a/devbot/system.py b/devbot/system.py index f783bd8..a69c2bd 100644 --- a/devbot/system.py +++ b/devbot/system.py @@ -160,7 +160,7 @@ def remove_packages(package_manager, packages): package_manager.remove_packages(to_remove) def check(remove=False, update=False, test=False, interactive=True): - package_manager = + package_manager = \ distro.get_package_manager(test=test, interactive=interactive) distro_name = distro.get_distro_name() |