[webkit-changes] cvs commit: WebKitTools/Scripts cvs-apply

[Eric]

eseidel     05/11/28 10:32:41

  Modified:    .        ChangeLog
               Scripts  cvs-apply
  Log:
  Bug #: none
  Submitted by: eseidel
  Reviewed by: sullivan and GGAREN
          Minor additions to make error messages more clear from cvs-apply.
  
          * Scripts/cvs-apply: make errors more clear
  
  Revision  Changes    Path
  1.122     +8 -0      WebKitTools/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKitTools/ChangeLog,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- ChangeLog	28 Nov 2005 06:21:21 -0000	1.121
  +++ ChangeLog	28 Nov 2005 18:32:40 -0000	1.122
  @@ -1,3 +1,11 @@
  +2005-11-28  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by sullivan and GGAREN.
  +
  +        Minor additions to make error messages more clear from cvs-apply.
  +
  +        * Scripts/cvs-apply: make errors more clear
  +
   2005-11-27  Oliver Hunt  <ojh16 at student.canterbury.ac.nz>
   
   	Reviewed and committed by Maciej.
  
  
  
  1.10      +2 -2      WebKitTools/Scripts/cvs-apply
  
  Index: cvs-apply
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/cvs-apply,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- cvs-apply	7 Nov 2005 21:32:52 -0000	1.9
  +++ cvs-apply	28 Nov 2005 18:32:41 -0000	1.10
  @@ -113,11 +113,11 @@
           # Either a deletion or an addition.
   
           # Change directory down into the directory in question.
  -        $patch =~ m|^Index: (([^/\n]*/)*)([^/\n]+)| or die;
  +        $patch =~ m|^Index: (([^/\n]*/)*)([^/\n]+)| or die "Failed to find Index: in \"$patch\"\n";
           my $prefix = $1;
           my $base = $3;
           if ($prefix) {
  -            chdir $prefix or die;
  +            chdir $prefix or die "Failed to chdir to $prefix";
           }
   
           if ($patch =~ /\n@@ .* \+0,0 @@/) {