From: Zack Cerza Date: Tue, 30 Sep 2014 19:36:36 +0000 (-0600) Subject: Move VersionNotFoundError to exceptions module X-Git-Tag: 1.1.0~1136 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=660832376680fe8f264be9831fcc5a1dd873371e;p=teuthology.git Move VersionNotFoundError to exceptions module Signed-off-by: Zack Cerza --- diff --git a/teuthology/exceptions.py b/teuthology/exceptions.py index 56bb43256e..573c335ab3 100644 --- a/teuthology/exceptions.py +++ b/teuthology/exceptions.py @@ -77,3 +77,11 @@ class ScheduleFailError(RuntimeError): name=self.name, msg=self.message, ).replace(' ', ' ') + + +class VersionNotFoundError(Exception): + def __init__(self, url): + self.url = url + + def __str__(self): + return "Failed to fetch package version from %s" % self.url diff --git a/teuthology/task/install.py b/teuthology/task/install.py index 91e003abe0..c9efc04d62 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -9,6 +9,7 @@ import subprocess from teuthology import misc as teuthology from teuthology import contextutil +from teuthology.exceptions import VersionNotFoundError from teuthology.parallel import parallel from ..orchestra import run from ..orchestra.run import CommandFailedError @@ -262,15 +263,6 @@ def _get_baseurl(ctx, remote, config): return base_url -class VersionNotFoundError(Exception): - - def __init__(self, url): - self.url = url - - def __str__(self): - return "Failed to fetch package version from %s" % self.url - - def _block_looking_for_package_version(remote, base_url, wait=False): """ Look for, and parse, a file called 'version' in base_url. @@ -1087,7 +1079,7 @@ def upgrade_common(ctx, config, deploy_style): # FIXME: again, make extra_pkgs distro-agnostic pkgs += extra_pkgs node['project'] = project - + deploy_style(ctx, node, remote, pkgs, system_type)