From 46459053f463789f01a4afc159d1ab02a1940a11 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Thu, 13 Feb 2014 21:02:18 +0100 Subject: [PATCH 1/2] use posix -L in favour of longopts Signed-off-by: Steven Armstrong --- cdist/test/fixtures/remote/copy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/test/fixtures/remote/copy b/cdist/test/fixtures/remote/copy index a4627716..05f43eb1 100755 --- a/cdist/test/fixtures/remote/copy +++ b/cdist/test/fixtures/remote/copy @@ -1,7 +1,7 @@ #!/bin/sh # # 2012-2013 Nico Schottelius (nico-cdist schottelius.org) -# 2013 Steven Armstrong (steven-cdist armstrong.cc) +# 2013-2014 Steven Armstrong (steven-cdist armstrong.cc) # # This file is part of cdist. # @@ -20,4 +20,4 @@ # code="$(echo "$@" | sed "s|\([[:space:]]\)$__target_host:|\1|g")" -cp --dereference $code +cp -L $code From f82a6224f228cf9bb52b44302e8371cfd5a125c6 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Thu, 13 Feb 2014 21:05:37 +0100 Subject: [PATCH 2/2] use positional arguments in favour of keyword arguments for backwards compatibility with older python Signed-off-by: Steven Armstrong --- cdist/test/cdist_object/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/test/cdist_object/__init__.py b/cdist/test/cdist_object/__init__.py index 28f2455b..3c25a959 100644 --- a/cdist/test/cdist_object/__init__.py +++ b/cdist/test/cdist_object/__init__.py @@ -49,7 +49,7 @@ class ObjectClassTestCase(test.CdistTestCase): self.expected_objects = [] for cdist_object_name in self.expected_object_names: - cdist_type, cdist_object_id = cdist_object_name.split("/", maxsplit=1) + cdist_type, cdist_object_id = cdist_object_name.split("/", 1) cdist_object = core.CdistObject(core.CdistType(type_base_path, cdist_type), object_base_path, cdist_object_id) self.expected_objects.append(cdist_object)