Mailing List Archive

Author: jm
Date: Fri Dec 8 07:07:37 2006
New Revision: 484630

URL: http://svn.apache.org/viewvc?view=rev&rev=484630
Log:
more improvement of debug support; less undef value warnings

Modified:
spamassassin/trunk/build/mkupdates/listpromotable

Modified: spamassassin/trunk/build/mkupdates/listpromotable
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/listpromotable?view=diff&rev=484630&r1=484629&r2=484630
==============================================================================
--- spamassassin/trunk/build/mkupdates/listpromotable (original)
+++ spamassassin/trunk/build/mkupdates/listpromotable Fri Dec 8 07:07:37 2006
@@ -64,7 +64,7 @@
$submitters = $1;
}
else {
- die "failed to find 'mcviewing' and 'mcsubmitters' microformats from $cgi_url";
+ loghtml_die("failed to find 'mcviewing' and 'mcsubmitters' microformats");
}

###########################################################################
@@ -92,7 +92,11 @@
}

if (!scalar keys %$plist) {
- die "no rules found?\nURL: $url\ngot:\n$doc\n";
+ loghtml_die("no rules found?");
+}
+
+sub loghtml_die {
+ die "$_[0]\nURL: $url\ngot:\n$doc\n";
}

###########################################################################
@@ -203,7 +207,7 @@
# that require a plugin we won't have
my $skip = 0;
my $ifs = $mailsa->{conf}->{if_stack}->{$name};
- while ($ifs =~ /plugin\s*\((.+?)\)/g) {
+ while ($ifs && $ifs =~ /plugin\s*\((.+?)\)/g) {
my $pkg = $1;
# grep out the ones we *do* have, and do use in "ifplugin"
# lines in "rulesrc", here...