Merge remote-tracking branch 'github/master' into 2.3

11 years ago · 1c7f8baa02
parent 3c49e93bfe 8b7e1f16e9
commit 1c7f8baa02
2 changed files with 2 additions and 6 deletions
--- a/cdist/test/fixtures/remote/copy
+++ b/cdist/test/fixtures/remote/copy
@ -18,10 +18,6 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
-#
-# This is based on other/examples/remote/local/, but uses --dereference for the
-# test cases
-#

-code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")"
+code="$(echo "$@" | sed "s|\([[:space:]]\)$__target_host:|\1|g")"
 cp --dereference $code
--- a/other/examples/remote/local/copy
+++ b/other/examples/remote/local/copy
@ -20,5 +20,5 @@
 #
 #

-code="$(echo "$@" | sed "s|\([[:space:]]+\)$__target_host:|\1|g")"
+code="$(echo "$@" | sed "s|\([[:space:]]\)$__target_host:|\1|g")"
 cp --dereference $code