From 2c0a7adf74578ce6151468afcf724ddddbcf46fc Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 27 Sep 2011 00:49:12 +0200 Subject: [PATCH] replace CdistError with cdist.Error Signed-off-by: Nico Schottelius --- lib/cdist/emulator.py | 3 ++- lib/cdist/exec.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cdist/emulator.py b/lib/cdist/emulator.py index a97959e6..bd97f69b 100644 --- a/lib/cdist/emulator.py +++ b/lib/cdist/emulator.py @@ -24,6 +24,7 @@ import logging import os import sys +import cdist import cdist.path log = logging.getLogger(__name__) @@ -87,7 +88,7 @@ def emulator(argv): try: os.makedirs(param_out_dir, exist_ok=True) except OSError as error: - raise CdistError(param_out_dir + ": " + error.args[1]) + raise cdist.Error(param_out_dir + ": " + error.args[1]) # Record parameter params = vars(args) diff --git a/lib/cdist/exec.py b/lib/cdist/exec.py index 7985bdb3..9cedefcc 100644 --- a/lib/cdist/exec.py +++ b/lib/cdist/exec.py @@ -58,7 +58,6 @@ def shell_run_or_debug_fail(script, *args, remote_prefix=False, **kargs): except OSError as error: raise cdist.Error(" ".join(*args) + ": " + error.args[1]) - def run_or_fail(*args, remote_prefix=False, **kargs): if remote_prefix: args[0][:0] = remote_prefix