Merge branch 'master' into next

2013-07-10 02:49:52 +01:00
parent cbceffcb6a 05284b4df8
commit e8c40a9285
5 changed files with 86 additions and 78 deletions
--- a/offlineimap/repository/IMAP.py
+++ b/offlineimap/repository/IMAP.py
@@ -148,6 +148,13 @@ class IMAPRepository(BaseRepository):


    def getport(self):
+        port = None
+
+        if self.config.has_option(self.getsection(), 'remoteporteval'):
+            port = self.getconf('remoteporteval')
+        if port != None:
+            return self.localeval.eval(port)
+
        return self.getconfint('remoteport', None)

    def getssl(self):