From 59bee1410147bfc40eb6387d2363e27921e859a2 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 6 Oct 2011 14:02:37 +0200 Subject: [PATCH] begin to eliminate remote_user/prefix from path Signed-off-by: Nico Schottelius --- lib/cdist/path.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/cdist/path.py b/lib/cdist/path.py index e416c42d..721764bf 100644 --- a/lib/cdist/path.py +++ b/lib/cdist/path.py @@ -57,8 +57,6 @@ class Path: def __init__(self, target_host, - remote_user, - remote_prefix, initial_manifest=False, base_dir=None, debug=False): @@ -72,9 +70,6 @@ class Path: self.temp_dir = tempfile.mkdtemp() self.target_host = target_host - self.remote_user = remote_user - self.remote_prefix = remote_prefix - self.conf_dir = os.path.join(self.base_dir, "conf") self.cache_base_dir = os.path.join(self.base_dir, "cache") self.cache_dir = os.path.join(self.cache_base_dir, target_host) @@ -122,10 +117,10 @@ class Path: def remote_mkdir(self, directory): """Create directory on remote side""" - cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=self.remote_prefix) + cdist.exec.run_or_fail(["mkdir", "-p", directory], remote_prefix=True) def remove_remote_dir(self, destination): - cdist.exec.run_or_fail(["rm", "-rf", destination], remote_prefix=self.remote_prefix) + cdist.exec.run_or_fail(["rm", "-rf", destination], remote_prefix=True) def transfer_dir(self, source, destination): """Transfer directory and previously delete the remote destination"""