Changeset 46927 in webkit

Timestamp:

Aug 7, 2009 4:34:46 PM (15 years ago)

Author:

Darin Adler

Message:

• Scripts/commit-log-editor: Fix unchecked access to environment

variable that may not be there.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/commit-log-editor (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-07  Darin Adler  <darin@apple.com>
+
+        * Scripts/commit-log-editor: Fix unchecked access to environment
+        variable that may not be there.
+
 2009-08-07  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/Scripts/commit-log-editor

@@ -94 +94 @@
     }
 
-    if(!isGit() || (/^#/)) {
+    if (!isGit() || /^#/) { #
         $logContents .= $_;
     } else {
@@ -109 +109 @@
 # different from perl's line endings.
 my $endl = "\n";
-if ($logContents =~ /(\r?\n)/g) {
-    $endl = $1;
-}
+$endl = $1 if $logContents =~ /(\r?\n)/;
 
 my $keepExistingLog = 1;
@@ -150 +148 @@
             $blankLines = "";
 
-            # Remove identation spaces
-            $line =~ s/^\s{8}//;
+            # Remove indentation spaces
+            $line =~ s/^ {8}//;
 
             # Save the reviewed by line
@@ -172 +170 @@
             # Attempt to insert the "patch by" line, after the first blank line.
             if ($previousLineWasBlank && $hasAuthorInfoToWrite && $lineCount > 0) {
-                my $authorAndCommitterAreSamePerson = $email eq $ENV{'EMAIL_ADDRESS'};
+                my $authorAndCommitterAreSamePerson = $ENV{EMAIL_ADDRESS} && $email eq $ENV{EMAIL_ADDRESS};
                 if (!$authorAndCommitterAreSamePerson) {
                     $contents .= "Patch by $author <$email> on $date\n";