From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 15 Jun 2010 19:36:43 +0100
Subject: Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760
---
 WebKitTools/Scripts/ensure-valid-python | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 WebKitTools/Scripts/ensure-valid-python

(limited to 'WebKitTools/Scripts/ensure-valid-python')

diff --git a/WebKitTools/Scripts/ensure-valid-python b/WebKitTools/Scripts/ensure-valid-python
old mode 100644
new mode 100755
index c21ad4e..4640a01
--- a/WebKitTools/Scripts/ensure-valid-python
+++ b/WebKitTools/Scripts/ensure-valid-python
@@ -31,6 +31,7 @@ use File::Basename;
 use File::Spec;
 use File::Temp qw(tempdir);
 use FindBin;
+use Getopt::Long;
 
 use lib $FindBin::Bin;
 use webkitdirs;
@@ -41,7 +42,7 @@ my $macPythonMD5 = "84489bba813fdbb6041b69d4310a86da";
 my $macPythonInstallerName = "Python.mpkg";
 
 # We could use a consistent download location, like the source or build directory.
-my $tempDirectory = File::Temp->newdir();
+my $tempDirectory = File::Temp->tempdir("WebKitPythonXXXX");
 my $downloadDirectory = $tempDirectory;
 my $mountPoint = File::Spec->join($tempDirectory, "mount");
 
@@ -117,11 +118,27 @@ sub installMacPython()
 
 sub main()
 {
+    my $checkOnly = 0;
+    my $showHelp = 0;
+    my $getOptionsResult = GetOptions(
+        'check-only!' => \$checkOnly,
+        'help|h' => \$showHelp,
+    );
+    if (!$getOptionsResult || $showHelp) {
+        print STDERR <<HELP;
+Usage: $0 [options]
+  --check-only        Check python version only.
+  -h|--help           Show this help message.
+HELP
+        return 1;
+    }
     # Congrats, your Python is fine.
     return 0 if checkPythonVersion();
-    
+
+    return 1 if $checkOnly;
+
     if (!isTiger()) {
-        print "Your Python version is insuficient to run WebKit's Python code.  Please update.\n";
+        print "Your Python version is insufficient to run WebKit's Python code.  Please update.\n";
         print "See http://trac.webkit.org/wiki/PythonGuidelines for more info.\n";
         return 1;
     }
-- 
cgit v1.1