INN commit: branches/2.4/frontends (pullnews.in)

[INN Commit]

    Date: Sunday, June 8, 2008 @ 02:15:41
  Author: iulius
Revision: 7862

Two minor issues resolved with this patch by Geraint Edwards:
  * an off-by-one error on the limit to the amount of articles to get;
  * when an article is not available, we may have redundantly retried that article.

Modified:
  branches/2.4/frontends/pullnews.in

-------------+
 pullnews.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: pullnews.in
===================================================================
--- pullnews.in	2008-06-08 09:14:28 UTC (rev 7861)
+++ pullnews.in	2008-06-08 09:15:41 UTC (rev 7862)
@@ -582,9 +582,9 @@
     my $i;
     my @warns;
     for ($i = ($first > $high ? $first : $high + 1) ; $i <= $last ; $i++) {
+        last if defined $maxArts and $count >= $maxArts;
+        last if defined $opt_f and $count >= $toget;
         $count++;
-        last if defined $maxArts and $count > $maxArts;
-        last if defined $opt_f and $count > $toget;
         sleep $opt_z if defined $opt_z and $count > 1;
         my $article = $fromServer->article($i);
         if ($article) {
@@ -793,6 +793,7 @@
 
             $shash->{$group} = [ time, $high = $i ];
         } else {
+            $shash->{$group} = [ time, $high = $i ] if $fromServer->code() == 430;    # no such article, do not retry
             print LOG "x" unless $quiet;
             printf LOG ("\nDEBUGGING $i %s %s\n", $fromServer->code(),
                         $fromServer->message()) if $debug >= 2;