summaryrefslogtreecommitdiffstats
path: root/WebKitTools/Scripts/bisect-builds
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-11 17:01:47 +0100
committerBen Murdoch <benm@google.com>2009-08-11 18:21:02 +0100
commit0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch)
tree2943df35f62d885c89d01063cc528dd73b480fea /WebKitTools/Scripts/bisect-builds
parent7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff)
downloadexternal_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz
external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2
Merge in WebKit r47029.
Diffstat (limited to 'WebKitTools/Scripts/bisect-builds')
-rwxr-xr-xWebKitTools/Scripts/bisect-builds4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/bisect-builds b/WebKitTools/Scripts/bisect-builds
index 45fdcc4..34230a9 100755
--- a/WebKitTools/Scripts/bisect-builds
+++ b/WebKitTools/Scripts/bisect-builds
@@ -209,7 +209,7 @@ sub createTempFile($)
my ($fh, $tempFile) = tempfile(
basename($0) . "-XXXXXXXX",
- DIR => ($ENV{'TMPDIR'} || "/tmp"),
+ DIR => File::Spec->tmpdir,
SUFFIX => ".html",
UNLINK => 0,
);
@@ -273,7 +273,7 @@ sub findSafariVersion($)
while (<PLIST>) {
if (m#^\s*<key>CFBundleShortVersionString</key>#) {
$version = <PLIST>;
- $version =~ s#^\s*<string>(.+)</string>\s*[\r\n]*#$1#;
+ $version =~ s#^\s*<string>([0-9.]+)[^<]*</string>\s*[\r\n]*#$1#;
}
}
close(PLIST);