From: lace <> Date: Wed, 3 Nov 2010 21:38:29 +0000 (+0000) Subject: rh update X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=commitdiff_plain;h=f76dc20fc0c3cb0968e07c574675157fb7ee65f4 rh update --- diff --git a/PerlMail/Config.pm b/PerlMail/Config.pm index e4a8386..2269453 100644 --- a/PerlMail/Config.pm +++ b/PerlMail/Config.pm @@ -207,6 +207,7 @@ sub audit store "=spam" if headeris "From",''; store "=spam" if headeris "From",''; store "=spam" if headeris "From",''; + store "=spam" if headeris "From",''; for my $header (qw(To Cc)) { store "=spam" if headerhas $header,''; store "=spam" if headerhas $header,''; @@ -364,6 +365,7 @@ if (0) { store "=federrata","log" if headeris "Return-Path",''; store "=fedtools","log" if headeris "List-Id" ,''; store "=freleng","log" if headeris "List-Id" ,''; + store "=ftest","log" if headeris "List-Id" ,''; if (headeris("List-Id" ,'') || headeris("List-Id" ,'')) { store "=fedd","log"; @@ -436,16 +438,20 @@ if (0) { store "=rhbug","log" if headeris "X-BeenThere",''; store "=rhgdb","log" if headeris "List-Id" ,''; store "=rhit","log" if headeris "Return-Path",''; - store "=rhcommit","log" if headeris("List-Id" ,'') - || headeris("X-CVS-Server",''); - store "=rhcommitgdb","log" if headeris "X-CVS-Directory",qr{^rpms/gdb(?:/.*)?$}; - store "=rhcommitgcc","log" if headeris "X-CVS-Directory",qr{^rpms/gcc(?:/.*)?$}; - store "=rhcommitlibunwind","log" if headeris "X-CVS-Directory",qr{^rpms/libunwind(?:/.*)?$}; - store "=rhcommitstrace","log" if headeris "X-CVS-Directory",qr{^rpms/strace(?:/.*)?$}; - store "=rhcommitbinutils","log" if headeris "X-CVS-Directory",qr{^rpms/binutils(?:/.*)?$}; - store "=rhcommitinsight","log" if headeris "X-CVS-Directory",qr{^rpms/insight(?:/.*)?$}; - store "=rhcommitptrace","log" if headeris "X-CVS-Directory",qr{^tests/kernel/syscalls/ptrace(?:/.*)? }; - store "=rhcommitgdbtest","log" if headeris "X-CVS-Directory",qr{^tests/gdb/gdb-any(?:/.*)? }; + if ($Audit->subject()!~/^Broken dependencies/) { + store "=rhcommit","log" if headeris("List-Id" ,'') + || headeris("X-CVS-Server",''); + store "=rhcommitgdb","log" if headeris("X-CVS-Directory",qr{^rpms/gdb(?:/.*)?$}) + || headeris("Delivered-To",''); + store "=rhcommitgcc","log" if headeris("X-CVS-Directory",qr{^rpms/gcc(?:/.*)?$}) + || headeris("Delivered-To",''); + store "=rhcommitlibunwind","log" if headeris "X-CVS-Directory",qr{^rpms/libunwind(?:/.*)?$}; + store "=rhcommitstrace","log" if headeris "X-CVS-Directory",qr{^rpms/strace(?:/.*)?$}; + store "=rhcommitbinutils","log" if headeris "X-CVS-Directory",qr{^rpms/binutils(?:/.*)?$}; + store "=rhcommitinsight","log" if headeris "X-CVS-Directory",qr{^rpms/insight(?:/.*)?$}; + store "=rhcommitptrace","log" if headeris "X-CVS-Directory",qr{^tests/kernel/syscalls/ptrace(?:/.*)? }; + store "=rhcommitgdbtest","log" if headeris "X-CVS-Directory",qr{^tests/gdb/gdb-any(?:/.*)? }; + } store "=rhbrnowiki","log" if headeris("Return-Path",'') && headeris("From" ,'') && headeris("To" ,'') @@ -467,19 +473,21 @@ if (0) { store "=rherrata","log" if $Audit->get("X-Erratatool-Component") || (headeris("Return-Path",'') && headeris("Subject",qr{^Changed Errata Request })); - if (headeris "Subject" ,qr{^\Q[rpmdiff] INSPECTION: Erratum \E\d{4}:\d{4} .*\btest results\b}) { + if (headeris "Subject" ,qr{^\Q[rpmdiff] INSPECTION: Erratum \E\d{4}:\d{4,5} .*\btest results\b}) { store "=rherrata","log"; # `[rpmdiff] INSPECTION:' came from `root@rpmdiff3.test.redhat.com'. } elsif ((headeris("To",'') || !$Audit->get("To") || $Audit->get("To") eq "undisclosed-recipients:;") - && headeris("Return-Path",qr{^\Qroot@\E.*[.](?:(?:lab|rhts|eng).(?:bos|boston)|z900|test|englab.brq|nay)\Q.redhat.com\E$})) { + && headeris("Return-Path",qr{^\Qroot@\E.*[.](?:(?:lab|rhts|eng)[.](?:bos|boston)|z900|test|englab[.]brq|eng.brq|nay)\Q.redhat.com\E$})) { store "=rhtsme","log"; } store "=rhtsme","log" if headeris "Subject" ,qr{^\Q[Beaker Job Completion] \E}; store "=buggcc","log" if headeris("Return-Path",'') || headeris("Return-Path",''); + store "=bugsav","log" if headeris "Return-Path",''; store "=frysk","log" if headeris "Mailing-List",'contact frysk-help@sourceware.org; run by ezmlm'; store "=fryskcvs","log" if headeris "List-Id" ,''; - store "=bugsrc","log" if headeris "Return-Path",''; + store "=bugsrc","log" if headeris("Return-Path",'') + || headeris("Return-Path",''); store "=rhwc","log" if headeris "Subject" ,'Cron $HOME/redhat/bin/rhwc'; store "=dwarf","log" if headeris "List-Id" ,''; store "=dwarf","log" if headeris "List-Id" ,''; @@ -494,10 +502,17 @@ if (0) { if (headeris "Return-Path",'') { if ($Audit->subject()=~/^\d+ builds? marked for deletion$/) { store "=fkojidel","log"; + } elsif ($Audit->subject()=~/^Broken dependencies: /) { + store "=fkojidep","log"; + } elsif ($Audit->from()=~/^S390 Koji Build System /) { + store "=fkojis390","log"; } else { store "=fkoji","log"; } } + store "=fkojidep","log" if (headeris("From" ,'') + && $Audit->subject()=~/^Broken dependencies/); + store "=fkojiarm","log" if headeris "From" ,''; if (headeris "Return-Path",'') { if ($Audit->subject()=~/^\d+ builds? marked for deletion$/) { store "=rhbrewdel","log";