Update of /cvsroot/fink/fink/t/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15001/Services

Modified Files:
      Tag: branch_0_24
        ChangeLog execute_nonroot_okay.t 
Log Message:
Backport more-portable-mktemp patch from HEAD.


Index: execute_nonroot_okay.t
===================================================================
RCS file: /cvsroot/fink/fink/t/Services/execute_nonroot_okay.t,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- execute_nonroot_okay.t      11 Jan 2005 19:02:36 -0000      1.16
+++ execute_nonroot_okay.t      14 Jul 2005 01:57:05 -0000      1.16.2.1
@@ -25,7 +25,19 @@
 #                  );
 
 # OS X 10.2 mktemp does not have the -p flag implemented
-my $tmpdir = `/usr/bin/mktemp -d /tmp/execute_nonroot_okay.t_XXXXX`;
+my $mktemp;
+foreach (qw| /usr/bin/mktemp /bin/mktemp |) {
+    if (-x $_) {
+       $mktemp = $_;
+       last;
+    }
+}
+if (!defined $mktemp) {
+    print "Bail out! Cannot create scratchdir (no mktemp found)\n";
+    die "\n";
+}
+
+my $tmpdir = `$mktemp -d /tmp/execute_nonroot_okay.t_XXXXX`;
 chomp $tmpdir;
 
 if (!defined $tmpdir or !length $tmpdir or !-d $tmpdir) {

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/t/Services/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- ChangeLog   11 Jan 2005 19:02:36 -0000      1.14
+++ ChangeLog   14 Jul 2005 01:57:05 -0000      1.14.2.1
@@ -1,3 +1,7 @@
+2005-07-13  Daniel Macks  <[EMAIL PROTECTED]>
+
+       * execute_nonroot_okay.t: more platform-portable `mktemp` (backport 
from HEAD)
+
 2005-1-11  Daniel Macks  <[EMAIL PROTECTED]>
 
        * execute_nonroot_okay.t: execute() may fork a process that needs



-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to