]> git.madduck.net Git - etc/offlineimap.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/offlineimap
authormartin f. krafft <madduck@madduck.net>
Sun, 1 Mar 2009 17:37:38 +0000 (18:37 +0100)
committermartin f. krafft <madduck@madduck.net>
Sun, 1 Mar 2009 17:37:38 +0000 (18:37 +0100)
Conflicts:
.offlineimap/helper.py

.offlineimap/helper.py

index b6c5c0726a442c2881c12b540a4f602e4c4f13f9..056eb5dc9c7001c4a4522454488f67beca90fec0 100644 (file)
@@ -58,5 +58,5 @@ def py_folderfilter_seamus(x):
     return True
 
 def py_folderfilter_mbnames(acct, x):
-    if acct == 'logcheck': return False
-    return not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)
+    return acct in ['seamus.madduck.net'] \
+            and not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)