diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-02-17 18:18:16 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-02-17 19:45:49 +0100 |
commit | a5e9668c5c2a43703a4f49ae673909c66acf7785 (patch) | |
tree | f47ffdc3676e7e7bba75831f2ea500b15cf3ae55 /nixos/lib | |
parent | 5231d0ac290f387885a20ece0c5cbb89ee223472 (diff) | |
download | nixlib-a5e9668c5c2a43703a4f49ae673909c66acf7785.tar nixlib-a5e9668c5c2a43703a4f49ae673909c66acf7785.tar.gz nixlib-a5e9668c5c2a43703a4f49ae673909c66acf7785.tar.bz2 nixlib-a5e9668c5c2a43703a4f49ae673909c66acf7785.tar.lz nixlib-a5e9668c5c2a43703a4f49ae673909c66acf7785.tar.xz nixlib-a5e9668c5c2a43703a4f49ae673909c66acf7785.tar.zst nixlib-a5e9668c5c2a43703a4f49ae673909c66acf7785.zip |
nixos/test: Fix escaping for copyFileFromHost
A long-time issue and one of the reasons I've never used that function before. So let's remove that todo-comment and escape the contents properly. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/test-driver/Machine.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 85bc376f67fa..30664406b26d 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -607,7 +607,8 @@ sub waitForWindow { sub copyFileFromHost { my ($self, $from, $to) = @_; my $s = `cat $from` or die; - $self->mustSucceed("echo '$s' > $to"); # !!! escaping + $s =~ s/'/'\\''/g; + $self->mustSucceed("echo '$s' > $to"); } |