summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/mail
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-31 16:52:10 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-31 16:52:10 -0300
commit1704ca96da952a17f5d06d34e2e13bc3bb499edd (patch)
treeba2b93fa8b6b564b2538c6a6e8d52870363a4a39 /src/leap/bitmask/services/mail
parent553bc677db6e24758c8a0d842de0d1839118271e (diff)
parent5ce85ca915bc63a08e82857a445c1866ca3abf85 (diff)
Merge remote-tracking branch 'kali/bug/improve-error-handling' into develop
Diffstat (limited to 'src/leap/bitmask/services/mail')
-rw-r--r--src/leap/bitmask/services/mail/imap.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/mail/imap.py b/src/leap/bitmask/services/mail/imap.py
index 4828180e..2667f156 100644
--- a/src/leap/bitmask/services/mail/imap.py
+++ b/src/leap/bitmask/services/mail/imap.py
@@ -41,9 +41,10 @@ def get_mail_check_period():
try:
period = int(period_str)
except (ValueError, TypeError):
- logger.warning("BAD value found for %s: %s" % (
- INCOMING_CHECK_PERIOD_ENV,
- period_str))
+ if period is not None:
+ logger.warning("BAD value found for %s: %s" % (
+ INCOMING_CHECK_PERIOD_ENV,
+ period_str))
except Exception as exc:
logger.warning("Unhandled error while getting %s: %r" % (
INCOMING_CHECK_PERIOD_ENV,