svn commit: r439352 - head/databases/libcouchbase/files

Alexey Dokuchaev danfe at FreeBSD.org
Tue Apr 25 02:23:07 UTC 2017


Author: danfe
Date: Tue Apr 25 02:23:06 2017
New Revision: 439352
URL: https://svnweb.freebsd.org/changeset/ports/439352

Log:
  Do not pass `-f' when removing temporary directory: it is not needed,
  and rm(1) command call looks safer without it.

Modified:
  head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl

Modified: head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl
==============================================================================
--- head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl	Tue Apr 25 02:13:34 2017	(r439351)
+++ head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl	Tue Apr 25 02:23:06 2017	(r439352)
@@ -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);


More information about the svn-ports-head mailing list