Title: [193514] trunk/Tools
Revision
193514
Author
[email protected]
Date
2015-12-05 09:08:20 -0800 (Sat, 05 Dec 2015)

Log Message

prepare-ChangeLog: Fix some warning messages when using svn
<http://webkit.org/b/151914>

Reviewed by Daniel Bates.

* Scripts/prepare-ChangeLog:
(generateFunctionLists): Simplify logic so that we never call
normalizePath() with an undefined value.
(attributeCommand): Quote $subPath for the shell so that we
don't try to run "svn propget" on invalid paths.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (193513 => 193514)


--- trunk/Tools/ChangeLog	2015-12-05 13:53:27 UTC (rev 193513)
+++ trunk/Tools/ChangeLog	2015-12-05 17:08:20 UTC (rev 193514)
@@ -1,3 +1,16 @@
+2015-12-05  David Kilzer  <[email protected]>
+
+        prepare-ChangeLog: Fix some warning messages when using svn
+        <http://webkit.org/b/151914>
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/prepare-ChangeLog:
+        (generateFunctionLists): Simplify logic so that we never call
+        normalizePath() with an undefined value.
+        (attributeCommand): Quote $subPath for the shell so that we
+        don't try to run "svn propget" on invalid paths.
+
 2015-12-04  David Kilzer  <[email protected]>
 
         TestNetscapePlugIn: Fix remaining static analyzer warnings

Modified: trunk/Tools/Scripts/prepare-ChangeLog (193513 => 193514)


--- trunk/Tools/Scripts/prepare-ChangeLog	2015-12-05 13:53:27 UTC (rev 193513)
+++ trunk/Tools/Scripts/prepare-ChangeLog	2015-12-05 17:08:20 UTC (rev 193514)
@@ -285,8 +285,7 @@
         my $file;
         open DIFF, "-|", diffCommand($changedFiles, $gitCommit, $gitIndex, $mergeBase) or die "The diff failed: $!.\n";
         while (<DIFF>) {
-            $file = makeFilePathRelative($1) if $_ =~ diffHeaderFormat();
-            $file = normalizePath($file);
+            $file = normalizePath(makeFilePathRelative($1)) if $_ =~ diffHeaderFormat();
             if (defined $file) {
                 my ($before_start, $before_end) = extractLineRangeBeforeChange($_);
                 if ($before_start >= 1 && $before_end >= 1) {
@@ -1961,7 +1960,7 @@
                 $foundAttribute = 1;
                 next;
             }
-            my $command = SVN . " propget $attr $subPath";
+            my $command = SVN . " propget $attr '$subPath'";
             my $attrib = $attributeCache{$attr}{$subPath} || `$command`;
             chomp $attrib;
             if ($attrib eq "1") {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to