Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/devbot
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-12-26 23:16:02 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-12-26 23:16:02 (GMT)
commitd12b70e9fd5fa8df034a4ad13c58734a500e48cd (patch)
tree22bb30b541967fe696ac82ca76ec151000ddfeb5 /devbot
parent626c63fa95dc5ffbbab7d3604962661755ea19b7 (diff)
Move public function at the top
Diffstat (limited to 'devbot')
-rw-r--r--devbot/system.py74
1 files changed, 37 insertions, 37 deletions
diff --git a/devbot/system.py b/devbot/system.py
index df96eea..d99a088 100644
--- a/devbot/system.py
+++ b/devbot/system.py
@@ -14,6 +14,43 @@ from devbot import xvfb
_checkers = {}
+def check(remove=False, update=False, test=False, interactive=True,
+ skip_if_unchanged=False):
+ if skip_if_unchanged:
+ if state.system_check_is_unchanged():
+ return True
+
+ package_manager = \
+ distro.get_package_manager(test=test, interactive=interactive)
+
+ distro.print_distro_info()
+ distro_name = distro.get_distro_info().name
+ packages = config.load_packages()
+
+ checks = config.load_prerequisites()
+ if not _run_checks(package_manager, checks, packages):
+ return False
+
+ xvfb_proc, orig_display = xvfb.start()
+
+ if not _run_checks(package_manager, config.load_checks(), packages):
+ return False
+
+ xvfb.stop(xvfb_proc, orig_display)
+
+ print "All the required dependencies are installed."
+
+ if update:
+ package_manager.update()
+
+ if remove:
+ _remove_packages(package_manager, packages)
+
+ state.system_check_touch()
+
+ return True
+
+
def _check_binary(check):
return subprocess.call(["which", check],
stdout=utils.devnull,
@@ -178,40 +215,3 @@ def _remove_packages(package_manager, packages):
if to_remove:
package_manager.remove_packages(to_remove)
-
-
-def check(remove=False, update=False, test=False, interactive=True,
- skip_if_unchanged=False):
- if skip_if_unchanged:
- if state.system_check_is_unchanged():
- return True
-
- package_manager = \
- distro.get_package_manager(test=test, interactive=interactive)
-
- distro.print_distro_info()
- distro_name = distro.get_distro_info().name
- packages = config.load_packages()
-
- checks = config.load_prerequisites()
- if not _run_checks(package_manager, checks, packages):
- return False
-
- xvfb_proc, orig_display = xvfb.start()
-
- if not _run_checks(package_manager, config.load_checks(), packages):
- return False
-
- xvfb.stop(xvfb_proc, orig_display)
-
- print "All the required dependencies are installed."
-
- if update:
- package_manager.update()
-
- if remove:
- _remove_packages(package_manager, packages)
-
- state.system_check_touch()
-
- return True