Changeset 46054 in webkit


Ignore:
Timestamp:
Jul 17, 2009 1:17:06 PM (15 years ago)
Author:
pkasting@chromium.org
Message:

2009-07-17 Peter Kasting <pkasting@google.com>

Reviewed by David Kilzer.

https://bugs.webkit.org/show_bug.cgi?id=27323
Avoid error spew on Macs, and fix a few other tiny details.

  • Scripts/svn-create-patch:
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r46053 r46054  
     12009-07-17  Peter Kasting  <pkasting@google.com>
     2
     3        Reviewed by David Kilzer.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=27323
     6        Avoid error spew on Macs, and fix a few other tiny details.
     7
     8        * Scripts/svn-create-patch:
     9
    1102009-07-17  Adam Treat  <adam.treat@torchmobile.com>
    211
  • trunk/WebKitTools/Scripts/svn-create-patch

    r45998 r46054  
    7878my $showHelp;
    7979my $svnVersion = `svn --version --quiet`;
     80my $devNull = File::Spec->devnull();
    8081
    8182my $result = GetOptions(
     
    172173    # svn may output a different EOL sequence than $/, so avoid chomp.
    173174    if ($mimeType) {
    174         $mimeType =~ s/\r?\n$//g;
     175        $mimeType =~ s/[\r\n]+$//g;
    175176    }
    176177    return $mimeType;
     
    288289    while (my $line = <STAT>) {
    289290        # svn may output a different EOL sequence than $/, so avoid chomp.
    290         $line =~ s/\r?\n$//g;
     291        $line =~ s/[\r\n]+$//g;
    291292        my $stat;
    292293        my $path;
     
    340341        print "svn:mime-type = ${mimeType}\n\n";
    341342    } else {
    342         print `svn cat ${sourceFile} | diff -u /dev/null - | tail -n +3`;
     343        print `svn cat ${sourceFile} | diff -u $devNull - | tail -n +3`;
    343344    }
    344345}
     
    472473    my $path = '.';
    473474    my $parent = '..';
    474     my $devnull = File::Spec->devnull();
    475475    my $repositoryRoot;
    476476    while (1) {
    477477        my $thisRoot;
    478         open INFO, "svn info '$path' |" or die;
     478        # Ignore error messages in case we've run past the root of the checkout.
     479        open INFO, "svn info '$path' 2> $devNull |" or die;
    479480        while (<INFO>) {
    480481            if (/^Repository Root: (.+)/) {
    481482                $thisRoot = $1;
     483                { local $/ = undef; <INFO>; }  # Consume the rest of the input.
    482484            }
    483485        }
Note: See TracChangeset for help on using the changeset viewer.