← Back to branch summary

~ubuntu-branches/ubuntu/utopic/spamassassin/utopic-updates

« back to all changes in this revision

Viewing changes to debian/patches/98_sa-compile-quiet

  • Committer: Package Import Robot
  • Author(s): Noah Meyerhans
  • Date: 2014-02-14 22:45:15 UTC
  • mfrom: (0.8.1) (0.6.2) (5.1.22 sid)
  • Revision ID: package-import@ubuntu.com-20140214224515-z1es2twos8xh7n2y
Tags: 3.4.0-1
http://bugs.debian.org/738963
http://bugs.debian.org/738872
http://bugs.debian.org/738867
http://bugs.debian.org/738951
http://bugs.debian.org/738974
* New upstream version! (Closes: 738963, 738872, 738867)
* Scrub the environment when switching to the debian-spamd user in
  postinst and cron.daily. (Closes: 738951)
* Enhancements to postinst to better manage ownership of
  /var/lib/spamassassin, via Iain Lane <iain.lane@canonical.com>
  (Closes: 738974)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/98_sa-compile-quiet
 
1
Index: spamassassin-3.4.0~rc5/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
 
2
===================================================================
 
3
--- spamassassin-3.4.0~rc5.orig/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm   2014-01-11 09:13:23.000000000 -0800
 
4
+++ spamassassin-3.4.0~rc5/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm        2014-02-14 21:34:59.109796791 -0800
 
5
@@ -192,7 +192,8 @@
 
6
         dbg("zoom: giving up on regexp: $eval_stat");
 
7
       };
 
8
 
 
9
-      if ($lossy && ($tflags->{$name}||'') =~ /\bmultiple\b/) {
 
10
+      if ($lossy && ($tflags->{$name}||'') =~ /\bmultiple\b/ &&
 
11
+          $self->{show_progress}) {
 
12
         warn "\nzoom: rule $name will loop on SpamAssassin older than 3.3.2 ".
 
13
              "running under Perl 5.12 or older, Bug 6558\n";
 
14
       }