Skip to content

Commit

Permalink
SpamAssassin: Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
reneschuster committed Feb 26, 2016
1 parent f703123 commit 31d0efe
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions incubator/SpamAssassin/backend/SpamAssassin.pm
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ sub _updateSpamassassinRules

if($self->{'config'}->{'heinlein-support_sa-rules'} eq 'yes') {
$rs = execute(
"/bin/su $saUser -c '/usr/bin/sa-update --nogpg --channel spamassassin.heinlein-support.de'", \my $stdout, \my $stderr
"/bin/su $saUser -c '/usr/bin/sa-update --nogpg --channel spamassassin.heinlein-support.de'", \$stdout, \$stderr
);
debug($stdout) if $stdout;
error($stderr) if $stderr && $rs >= 4;
Expand Down Expand Up @@ -491,7 +491,7 @@ sub _spamassassinRulesHeinleinSupport
return 1;
}

# Change the sleep timer to 600 seconds on all distributions
# Change the sleep timer to 600 seconds on all versions
$fileContent =~ s/3600/600/g;
# Change the sa-update channel on Ubuntu Precise
$fileContent =~ s/^(sa-update)$/$1 --nogpg --channel spamassassin.heinlein-support.de/m;
Expand All @@ -508,7 +508,7 @@ sub _spamassassinRulesHeinleinSupport
error($stderr) if $stderr && $rs;
return $rs if $rs;

$rs = execute("rm -f /etc/cron.hourly/spamassassin_heinlein-support_de", \my $stdout, \my $stderr);
$rs = execute("rm -f /etc/cron.hourly/spamassassin_heinlein-support_de", \$stdout, \$stderr);
debug($stdout) if $stdout;
error($stderr) if $stderr && $rs;
return $rs if $rs;
Expand Down

0 comments on commit 31d0efe

Please sign in to comment.