Changeset 27013 in webkit

Timestamp:

Oct 24, 2007, 8:50:17 PM (17 years ago)

Author:

ddkilzer

Message:

Minor clean-up of prepare-ChangeLog script.

Reviewed by Adam.

• Scripts/prepare-ChangeLog: Keep list of updated ChangeLog files in an array instead of a string. Use multi-argument versions of open() and system() for flexibility and security.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (3 diffs)

trunk/WebKitTools/ChangeLog ¶

@@ +1 @@
+2007-10-24  David Kilzer  <ddkilzer@webkit.org>
+
+        Minor clean-up of prepare-ChangeLog script.
+
+        Reviewed by Adam.
+
+        * Scripts/prepare-ChangeLog: Keep list of updated ChangeLog files in an array instead
+        of a string.  Use multi-argument versions of open() and system() for flexibility and
+        security.
+
 2007-10-24  Alice Liu  <alice.liu@apple.com>
 

trunk/WebKitTools/Scripts/prepare-ChangeLog ¶

@@ -4 +4 @@
 #
 #  Copyright (C) 2000, 2001 Eazel, Inc.
-#  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apple Inc.
+#  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apple Inc.  All rights reserved.
 #
 #  prepare-ChangeLog is free software; you can redistribute it and/or
@@ -262 +262 @@
 
 # Get the latest ChangeLog files from svn.
-my $logs = "";
+my @logs = ();
 foreach my $prefix (sort keys %files) {
-    $logs .= " ${prefix}ChangeLog";
-}
-
-if ($logs && $updateChangeLogs && $isSVN) {
+    push @logs, File::Spec->catfile($prefix, "ChangeLog");
+}
+
+if (@logs && $updateChangeLogs && $isSVN) {
     print STDERR "  Running 'svn update' to update ChangeLog files.\n";
-    open ERRORS, "$SVN update -q$logs |" or die "The svn update of ChangeLog files failed: $!.\n";
+    open ERRORS, "-|", $SVN, "update", "-q", @logs
+        or die "The svn update of ChangeLog files failed: $!.\n";
     print STDERR "    $_" while <ERRORS>;
     close ERRORS;
@@ -317 +318 @@
 
 # Open ChangeLogs.
-if ($openChangeLogs && $logs) {
+if ($openChangeLogs && @logs) {
     print STDERR "  Opening the edited ChangeLog files.\n";
     my $editor = $ENV{"CHANGE_LOG_EDIT_APPLICATION"};
     if ($editor) {
-        system "open -a '$editor'$logs";
+        system "open", "-a", $editor, @logs;
     } else {
-        system "open -e$logs";
+        system "open", "-e", @logs;
     }
 }