From 49d9f1f475ab1909c9923e91bb2d4b6717650631 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 12 Aug 2013 12:56:54 +0200 Subject: [PATCH] support relative paths in -c argument Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 2 +- docs/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index 854a1832..2f09ecbc 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -190,7 +190,7 @@ class Local(object): for entry in os.listdir(current_dir): rel_entry_path = os.path.join(sub_dir, entry) - src = os.path.join(conf_dir, sub_dir, entry) + src = os.path.abspath(os.path.join(conf_dir, sub_dir, entry)) dst = os.path.join(self.conf_path, sub_dir, entry) # Already exists? remove and link diff --git a/docs/changelog b/docs/changelog index 12c4221e..3227caa9 100644 --- a/docs/changelog +++ b/docs/changelog @@ -4,6 +4,9 @@ Changelog * Changes are always commented with their author in (braces) * Exception: No braces means author == Nico Schottelius +2.3.1: + * Core: Support relative paths for configuration directories + 2.3.0: 2013-08-12 * Core: Added support for cdist shell * Documentation: Improved some manpages