diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 19:09:42 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 19:09:42 -0400 |
commit | 1ff883371700757696efafefe266572776ac9558 (patch) | |
tree | d2104f7f405f4fe7a8957e86f53300ee6d4b1aeb /.maildirproc/default.rc | |
parent | 3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (diff) | |
parent | 3515a46d330af1d09bf1e0b963c13a86c2dbe8a8 (diff) |
Merge branch 'master' into build64-par
Conflicts:
.login-daemons
Diffstat (limited to '.maildirproc/default.rc')
-rw-r--r-- | .maildirproc/default.rc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 24f51e8..c2ad6f2 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -102,6 +102,10 @@ def my_filters(mail): mail.move(".software.parabola-dev") return + if (mail["List-Id"].matches("pacman-dev.archlinux.org")): + mail.move(".software.pacman-dev") + return + for subject_re in [ "\[Stow-[^\]]*\].*", ]: @@ -148,6 +152,7 @@ def my_filters(mail): or is_to_or_from(mail,"eldredmac@comcast.net")# MacDonell or is_to_or_from(mail,"mitchprather@sbcglobal.net") or is_to_or_from(mail,"oa_wap@yahoo.com") + or is_to_or_from(mail,"mytroop.us") ): mail.move(".Troop276") return @@ -158,6 +163,15 @@ def my_filters(mail): return for address in [ + "justicejade10@aol.com", + "parsonsjade@aol.com", + "parsonstjade@gmail.com", + ]: + if mail["From"].contains(address): + mail.move(".misc.Jade") + return + + for address in [ "nintendo.com", "nintendo-news.com", ]: @@ -190,7 +204,6 @@ def my_filters(mail): "@usfirst.org", "gamefreak207@gmail.com", # Brett Leedy "tswilson4801@att.net", - "justicejade10@aol.com", "silioso@gmail.com", "cdewalt3@yahoo.com", "bryanbonahoom@gmail.com", @@ -221,6 +234,8 @@ def my_filters(mail): "canonical.org", "foocorp.net", "cnuk.org", + "@archlinux.org", + "@github.com", ]: if is_to_or_from(mail,address): mail.move(".software") |