Merge branch 'issue/297' of git://github.com/asteven/cdist
This commit is contained in:
commit
ab8ae75837
2 changed files with 3 additions and 3 deletions
cdist/test
|
@ -49,7 +49,7 @@ class ObjectClassTestCase(test.CdistTestCase):
|
||||||
|
|
||||||
self.expected_objects = []
|
self.expected_objects = []
|
||||||
for cdist_object_name in self.expected_object_names:
|
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)
|
cdist_object = core.CdistObject(core.CdistType(type_base_path, cdist_type), object_base_path, cdist_object_id)
|
||||||
self.expected_objects.append(cdist_object)
|
self.expected_objects.append(cdist_object)
|
||||||
|
|
||||||
|
|
4
cdist/test/fixtures/remote/copy
vendored
4
cdist/test/fixtures/remote/copy
vendored
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# 2012-2013 Nico Schottelius (nico-cdist schottelius.org)
|
# 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.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
@ -20,4 +20,4 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
code="$(echo "$@" | sed "s|\([[:space:]]\)$__target_host:|\1|g")"
|
code="$(echo "$@" | sed "s|\([[:space:]]\)$__target_host:|\1|g")"
|
||||||
cp --dereference $code
|
cp -L $code
|
||||||
|
|
Loading…
Reference in a new issue