From 08c0a88459854e943160cb4567f516c34a2cf2e6 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Fri, 23 May 2014 20:19:09 +0200 Subject: [PATCH] Might as well check apt proxy early Moved CheckAptProxy to preparation phase Changed the logging to output a warning instead of an error Changed the error message a little --- bootstrapvz/plugins/apt_proxy/tasks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrapvz/plugins/apt_proxy/tasks.py b/bootstrapvz/plugins/apt_proxy/tasks.py index 22ac4d9..6447b70 100644 --- a/bootstrapvz/plugins/apt_proxy/tasks.py +++ b/bootstrapvz/plugins/apt_proxy/tasks.py @@ -6,8 +6,8 @@ import urllib2 class CheckAptProxy(Task): - description = 'Checking APT proxy server' - phase = phases.package_installation + description = 'Checking reachability of APT proxy server' + phase = phases.preparation @classmethod def run(cls, info): @@ -23,13 +23,13 @@ class CheckAptProxy(Task): else: import logging log = logging.getLogger(__name__) - log.error('The APT proxy server couldn\'t be reached. `apt-get` commands may fail from now on.') + log.warning('The APT proxy server couldn\'t be reached. `apt-get\' commands may fail.') class SetAptProxy(Task): description = 'Setting proxy for APT' phase = phases.package_installation - successors = [apt.AptUpdate, CheckAptProxy] + successors = [apt.AptUpdate] @classmethod def run(cls, info):