From 60b5f8783c56b405c4b13105dbd4bfeeb9671b6e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 6 Oct 2011 17:02:37 +0200 Subject: [PATCH] revert changes from upcoming install branch Signed-off-by: Nico Schottelius --- lib/cdist/config.py | 7 +++---- lib/cdist/install.py | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/cdist/config.py b/lib/cdist/config.py index 657714a4..0ae41174 100644 --- a/lib/cdist/config.py +++ b/lib/cdist/config.py @@ -22,13 +22,15 @@ import datetime import logging -log = logging.getLogger(__name__) +import sys import cdist.emulator import cdist.path CODE_HEADER = "#!/bin/sh -e\n" +log = logging.getLogger(__name__) + class Config: """Cdist main class to hold arbitrary data""" @@ -276,9 +278,6 @@ class Config: self.target_host, duration.total_seconds()) -class Config(cdist.config_install.ConfigInstall): - pass - def config(args): """Configure remote system""" process = {} diff --git a/lib/cdist/install.py b/lib/cdist/install.py index 5a35626d..87714fa8 100644 --- a/lib/cdist/install.py +++ b/lib/cdist/install.py @@ -27,9 +27,6 @@ import cdist.config_install log = logging.getLogger(__name__) -Class Install(cdist.config_install.ConfigInstall): - pass - def install(args): """Install remote system""" process = {}