[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 3bfbbe7719c5128d0511b6886bdb3e8e68914d46
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 24 19:50:54 2009 +0000

    <http://webkit.org/b/31840> bisect-builds broke after r50080
    
    Reviewed by Dan Bernstein.
    
    * Scripts/bisect-builds:
    (mountAndRunNightly): Switched back to using backticks to run
    the hdiutil command since exec() will terminate the existing
    script, which is not what we want.  Store the output of
    File::Spec->devnull() in a variable for use in the hdiutil
    detach commands.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 39295f9..e42ff8c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-24  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/31840> bisect-builds broke after r50080
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/bisect-builds:
+        (mountAndRunNightly): Switched back to using backticks to run
+        the hdiutil command since exec() will terminate the existing
+        script, which is not what we want.  Store the output of
+        File::Spec->devnull() in a variable for use in the hdiutil
+        detach commands.
+
 2009-11-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/bisect-builds b/WebKitTools/Scripts/bisect-builds
index 55bf238..063b61e 100755
--- a/WebKitTools/Scripts/bisect-builds
+++ b/WebKitTools/Scripts/bisect-builds
@@ -363,12 +363,13 @@ sub mountAndRunNightly($$$$)
     my $mountPath = "/Volumes/WebKit";
     my $webkitApp = File::Spec->catfile($mountPath, "WebKit.app");
     my $diskImage = File::Spec->catfile($directory, $filename);
+    my $devNull = File::Spec->devnull();
 
     my $i = 0;
     while (-e $mountPath) {
         $i++;
         usleep 100 if $i > 1;
-        exec "hdiutil", "detach '$mountPath' 2> " . File::Spec->devnull();
+        `hdiutil detach '$mountPath' 2> $devNull`;
         die "Could not unmount $diskImage at $mountPath" if $i > 100;
     }
     die "Can't mount $diskImage: $mountPath already exists!" if -e $mountPath;
@@ -393,7 +394,7 @@ sub mountAndRunNightly($$$$)
     $tempFile ||= "";
     `DYLD_FRAMEWORK_PATH=$frameworkPath WEBKIT_UNSET_DYLD_FRAMEWORK_PATH=YES $safari $tempFile`;
 
-    exec "hdiutil", "detach '$mountPath' 2> " . File::Spec->devnull();
+    `hdiutil detach '$mountPath' 2> $devNull`;
 }
 
 sub parseRevisions($$;$)

-- 
WebKit Debian packaging