[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

トップ ページ
このメッセージを削除
このメッセージに返信
著者: Philip Hazel
日付:  
To: exim-cvs
題目: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src exigrep.src
ph10 2007/03/13 11:26:49 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         exigrep.src 
  Log:
  Use "not accepted" rather than "not completed" for non-accepted messages
  shown by exigrep.


  Revision  Changes    Path
  1.492     +7 -0      exim/exim-doc/doc-txt/ChangeLog
  1.8       +10 -2     exim/exim-src/src/exigrep.src


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.491
  retrieving revision 1.492
  diff -u -r1.491 -r1.492
  --- ChangeLog    13 Mar 2007 11:06:48 -0000    1.491
  +++ ChangeLog    13 Mar 2007 11:26:49 -0000    1.492
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.491 2007/03/13 11:06:48 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.492 2007/03/13 11:26:49 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -155,6 +155,13 @@
PH/35 Applied a patch from the Sieve maintainer which fixes a bug in "notify".

   PH/36 Applied John Jetmore's patch to add -v functionality to exigrep.
  +
  +PH/37 If a message is not accepted after it has had an id assigned (e.g.
  +      because it turns out to be too big or there is a timeout) there is no
  +      "Completed" line in the log. When such a message was selected by exigrep,
  +      it was listed as "not completed". Such messages can be identified by the
  +      lack of a "<=" line in the log, and they are now listed as "not
  +      accepted".



Exim version 4.66

  Index: exigrep.src
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exigrep.src,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- exigrep.src    13 Mar 2007 11:06:48 -0000    1.7
  +++ exigrep.src    13 Mar 2007 11:26:49 -0000    1.8
  @@ -1,5 +1,5 @@
   #! PERL_COMMAND -w
  -# $Cambridge: exim/exim-src/src/exigrep.src,v 1.7 2007/03/13 11:06:48 ph10 Exp $
  +# $Cambridge: exim/exim-src/src/exigrep.src,v 1.8 2007/03/13 11:26:49 ph10 Exp $


use strict;

@@ -172,8 +172,16 @@

else { do_line() while (<STDIN>); }

-# At the end of processing all the input, print any uncompleted data
+# At the end of processing all the input, print any uncompleted messages. If
+# there is no <= line, we are dealing with a message that was rejected or
+# abandoned.

  -for (keys %id_list) { print "+++ $_ not completed +++\n$saved{$_}\n"; }
  +for (keys %id_list)
  +  {
  +  if ($saved{$_} =~ /\s<=\s/)
  +    { print "+++ $_ has not completed +++\n$saved{$_}\n"; }
  +  else
  +    { print "+++ $_ was not accepted +++\n$saved{$_}\n"; }
  +  }


# End of exigrep