Commit to debian by don@debian.org -- merge more changes from dla source

[Debbugs Maintainers]

------------------------------------------------------------
revno: 868
committer: Debian BTS <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-03-30 02:55:36 +0000
message:
  merge more changes from dla source
    ------------------------------------------------------------
    revno: 721.1.13.1.1.2.2.1.1.1.341
    merged: [EMAIL PROTECTED]
    committer: Don Armstrong <[EMAIL PROTECTED]>
    branch nick: source
    timestamp: Sat 2008-03-29 19:54:25 -0700
    message:
      fix defined tests in spamscan-sa

=== modified file 'scripts/spamscan.in'
--- scripts/spamscan.in 2008-03-30 02:47:21 +0000
+++ scripts/spamscan.in 2008-03-30 02:55:28 +0000
@@ -136,14 +136,14 @@
            }
            print $sain "$id\n$nf\n";
            lprint "{$mytid} $id is $nf\n";
-           my $keys;
-           unless (defined($keys = <$saout>)) {
+           my $keys = <$saout>
+           unless (defined $keys) {
                lprint "{$mytid} Could not get keys: $!\n";
                last pp;
            }
            chomp $keys;
-           my $messageid;
-           unless (defined($messageid = <$saout>)) {
+           my $messageid = <$saout>
+           unless (defined($messageid)) {
                lprint "{$mytid} Could not read messageid: $!\n";
                last pp;
            }
@@ -182,8 +182,8 @@
                lprint "{$mytid} Could not send ca_score: $!\n";
                last pp;
            }
-           my $todo;
-           unless (defined($todo = <$saout>)) {
+           my $todo = <$saout>;
+           unless (defined($todo)) {
                lprint "{$mytid} Could not read todo: $!\n";
                last pp;
            }
@@ -201,7 +201,7 @@
                print $sain "$todo\n";
                $nseen = <$saout>;
            }
-           unless($nseen) {
+           unless(defined($nseen)) {
                lprint "{$mytid} Could not read seen: $!\n";
                start_sa() if (scalar(@ids) > ($threadsrunning * 
$config{spam_spams_per_thread})
                    && $threadsrunning < $config{spam_max_threads});
@@ -209,8 +209,8 @@
            }
            chomp $nseen;
            $spamseen{$messageid} = $nseen if ($nseen);
-           my $out;
-           unless(defined($out = <$saout>)) {
+           my $out = <$saout>;
+           unless(defined($out)) {
                lprint "{$mytid} Could not read out: $!\n";
                last pp;
            }