Changeset 46672 in webkit

Timestamp:

Aug 1, 2009 7:29:33 AM (15 years ago)

Author:

ddkilzer@apple.com

Message:

resolve-ChangeLogs: add error checking to git ls-files command on close()

Reviewed by Eric Seidel.

Item 2 of <​https://bugs.webkit.org/show_bug.cgi?id=18599#c0>.

• Scripts/resolve-ChangeLogs: Added error checking to close() after running git ls-files. Added error checking to all system() calls by checking for a non-zero WEXITSTATUS($?).

Changed "

die;" expressions to "or die $!;".

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/resolve-ChangeLogs (modified) (14 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-08-01  David Kilzer  <ddkilzer@apple.com>
+
+        resolve-ChangeLogs: add error checking to git ls-files command on close()
+
+        Reviewed by Eric Seidel.
+
+        Item 2 of <https://bugs.webkit.org/show_bug.cgi?id=18599#c0>.
+
+        * Scripts/resolve-ChangeLogs: Added error checking to close()
+        after running git ls-files.  Added error checking to all
+        system() calls by checking for a non-zero WEXITSTATUS($?).
+        Changed "|| die;" expressions to "or die $!;".
+
 2009-08-01  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebKitTools/Scripts/resolve-ChangeLogs

@@ -165 +165 @@
 
     if ($isSVN) {
-        open STAT, "-|", $SVN, "status", $file || die;
+        open STAT, "-|", $SVN, "status", $file or die $!;
         my $status = <STAT>;
         close STAT;
@@ -176 +176 @@
 
         my $currentRevision;
-        open INFO, "-|", $SVN, "info", $file || die;
+        open INFO, "-|", $SVN, "info", $file or die $!;
         while (my $line = <INFO>) {
             if ($line =~ m/^Revision: ([0-9]+)/) {
@@ -195 +195 @@
         my $gitPrefix = `$GIT rev-parse --show-prefix`;
         chomp $gitPrefix;
-        open GIT, "-|", $GIT, "ls-files", "--unmerged", $file || die;
+        open GIT, "-|", $GIT, "ls-files", "--unmerged", $file or die $!;
         while (my $line = <GIT>) {
             my ($mode, $hash, $stage, $fileName) = split(' ', $line);
@@ -212 +212 @@
             }
             system("$GIT cat-file blob :${stage}:${gitPrefix}${file} > $outputFile");
-        }
-        close GIT;
+            die $! if WEXITSTATUS($?);
+        }
+        close GIT or die $!;
     } else {
         die "Unknown version control system";
@@ -340 +341 @@
     if (scalar(@changedFiles) < 1) {
         # Read in list of files changed in $revisionRange
-        open GIT, "-|", $GIT, "diff", "--name-only", $revisionRange || die;
+        open GIT, "-|", $GIT, "diff", "--name-only", $revisionRange or die $!;
         push @changedFiles, <GIT>;
-        close GIT || die;
+        close GIT or die $!;
         die "No changed files in $revisionRange" if scalar(@changedFiles) < 1;
         chomp @changedFiles;
@@ -366 +367 @@
     {
         local $/ = undef;
-        open GIT, "-|", $GIT, "diff", ($ENV{GIT_COMMIT} || "HEAD") . "^", $file || die;
+        open GIT, "-|", $GIT, "diff", ($ENV{GIT_COMMIT} || "HEAD") . "^", $file or die $!;
         $patch = <GIT>;
-        close GIT || die;
+        close GIT or die $!;
     }
 
     # Always checkout the previous commit's copy of the ChangeLog
     system($GIT, "checkout", $ENV{MAPPED_PREVIOUS_COMMIT} || "HEAD^", $file);
+    die $! if WEXITSTATUS($?);
 
     # The patch must have 0 or more lines of context, then 1 or more lines
@@ -401 +403 @@
 
         # Add 3 lines of context to the end
-        open FILE, "<", $file || die;
+        open FILE, "<", $file or die $!;
         for (my $i = 0; $i < 3; $i++) {
             $newPatch .= " " . <FILE>;
@@ -408 +410 @@
 
         # Apply the new patch
-        open(PATCH, "| patch -p1 $file > /dev/null") || die;
+        open(PATCH, "| patch -p1 $file > /dev/null") or die $!;
         print PATCH $newPatch;
-        close(PATCH) || die;
+        close(PATCH) or die $!;
 
         # Run "git add" on the fixed ChangeLog file
         system($GIT, "add", $file);
+        die $! if WEXITSTATUS($?);
 
         showStatus($file, 1);
@@ -419 +422 @@
         # Restore the current copy of the ChangeLog file since we can't repatch it
         system($GIT, "checkout", $ENV{GIT_COMMIT} || "HEAD", $file);
+        die $! if WEXITSTATUS($?);
         print STDERR "WARNING: Last change to ${file} could not be fixed and re-merged.\n" if $printWarnings;
     }
@@ -439 +443 @@
     my $patch;
     if ($traditionalReject) {
-        open(DIFF, "<", $fileMine);
+        open(DIFF, "<", $fileMine) or die $!;
         $patch = <DIFF>;
         close(DIFF);
@@ -445 +449 @@
         rename($fileOlder, "$fileOlder.save");
     } else {
-        open(DIFF, "-|", qw(diff -u -a --binary), $fileOlder, $fileMine) || die;
+        open(DIFF, "-|", qw(diff -u -a --binary), $fileOlder, $fileMine) or die $!;
         $patch = <DIFF>;
         close(DIFF);
@@ -453 +457 @@
     unlink("${fileNewer}.rej");
 
-    open(PATCH, "| patch --fuzz=3 --binary $fileNewer > /dev/null") || die;
+    open(PATCH, "| patch --fuzz=3 --binary $fileNewer > /dev/null") or die $!;
     print PATCH fixChangeLogPatch($patch);
     close(PATCH);
@@ -522 +526 @@
         if ($file ne $fileNewer) {
             unlink($file);
-            rename($fileNewer, $file) || die;
+            rename($fileNewer, $file) or die $!;
         }
         unlink($fileMine, $fileOlder);
@@ -540 +544 @@
     if ($isSVN) {
         system($SVN, "resolved", $file);
+        die $! if WEXITSTATUS($?);
     } elsif ($isGit) {
         system($GIT, "add", $file);
+        die $! if WEXITSTATUS($?);
     } else {
         die "Unknown version control system";