From 77b58a80ca62b85f920cdd55aeffbcbf699a7ce7 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Tue, 25 Apr 2017 02:23:06 +0000 Subject: Do not pass `-f' when removing temporary directory: it is not needed, and rm(1) command call looks safer without it. --- databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'databases/libcouchbase') diff --git a/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl b/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl index 8bf549873458..743fcee62d20 100644 --- a/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl +++ b/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl @@ -16,7 +16,7 @@ +# Copy .o files to a temporary location before DTrace messes with them +chomp(my $tmpdir = `mktemp -d -t $$`); +if (system("tar cf - @O_FILES | tar xf - -C $tmpdir") != 0) { -+ system("rm -rf $tmpdir"); ++ system("rm -r $tmpdir"); + exit(1); +} + @@ -38,7 +38,7 @@ print "$HDR: Creating instrumented DTrace object: @args"; if (system(@args) != 0) { -+ system("rm -rf $tmpdir"); ++ system("rm -r $tmpdir"); exit(1); } @@ -47,5 +47,5 @@ print "$HDR: Linking with instrumented DTrace object: @ARGV"; -exit(system(@ARGV)); +my $rc = system(@ARGV); -+system("rm -rf $tmpdir"); ++system("rm -r $tmpdir"); +exit($rc); -- cgit v1.2.3