sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

begin to eliminate remote_user/prefix from path

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-06 14:02:37 +02:00
parent df630e1fdf
commit 59bee14101
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/cdist/path.py
View file

@ -57,8 +57,6 @@ class Path:
def __init__(self, def __init__(self,
target_host, target_host,
remote_user,
remote_prefix,
initial_manifest=False, initial_manifest=False,
base_dir=None, base_dir=None,
debug=False): debug=False):
@ -72,9 +70,6 @@ class Path:
self.temp_dir = tempfile.mkdtemp() self.temp_dir = tempfile.mkdtemp()
self.target_host = target_host 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.conf_dir = os.path.join(self.base_dir, "conf")
self.cache_base_dir = os.path.join(self.base_dir, "cache") self.cache_base_dir = os.path.join(self.base_dir, "cache")
self.cache_dir = os.path.join(self.cache_base_dir, target_host) self.cache_dir = os.path.join(self.cache_base_dir, target_host)
@ -122,10 +117,10 @@ class Path:
def remote_mkdir(self, directory): def remote_mkdir(self, directory):
"""Create directory on remote side""" """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): 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): def transfer_dir(self, source, destination):
"""Transfer directory and previously delete the remote destination""" """Transfer directory and previously delete the remote destination"""