Fix default user for usertags

[debbugs.git] / scripts / spamscan

diff --git a/scripts/spamscan b/scripts/spamscan
index 9114b837439747b556b4ad9eede35218c8d72398..d68ebf0ba7693389c1c1a2f5587a1b9f3b1f35b9 100755 (executable)
--- a/scripts/spamscan
+++ b/scripts/spamscan
@@ -14,6 +14,8 @@
 use warnings;
 use strict;
 
+use lib qw(/srv/bugs.debian.org/scripts);
+
 use threads;
 use threads::shared;
 
@@ -110,7 +112,7 @@ sub sa {
     return if $spamscan_stop;
     my ($sain, $saout);
 
-    my $pid = open2($saout, $sain, "/usr/lib/debbugs/spamscan-sa");
+    my $pid = open2($saout, $sain, "/srv/bugs.debian.org/scripts/spamscan-sa");
        lprint "{$mytid} forked $pid\n";
        my $messages_handled=0;
 pp:    until ($spamscan_stop) {
@@ -259,10 +261,11 @@ for (;;) {
            last;
        }
         my @i;
-       opendir DIR, 'incoming' or die "opendir incoming: $!";
-       while (defined($_ = readdir DIR)) {
+       opendir my $dir, 'incoming' or die "opendir incoming: $!";
+       while (defined($_ = readdir $dir)) {
            push @i, $1 if /^S(.*)/;
        }
+       close $dir;
        unless (@i) {
            lprint "No more spam to process\n";
            last;