UID validity diagnostics improvement

[offlineimap] / offlineimap / accounts.py

diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index 74791b9a566ecfe1c4e44892047d2e596152e560..b0f51dc3d4c69e48ddc6a4199b687bdbe8d6e322 100644 (file)
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -1,6 +1,8 @@
 # Copyright (C) 2003 John Goerzen
 # <jgoerzen@complete.org>
 #
+# Portions Copyright (C) 2007 David Favro <offlineimap@meta-dynamic.com>
+#
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
@@ -13,7 +15,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from offlineimap import threadutil, mbnames, CustomConfig
 import offlineimap.repository.Base, offlineimap.repository.LocalStatus
@@ -189,12 +191,12 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
     # empty.  So, in that case, just save it off.
     if len(localfolder.getmessagelist()) or len(statusfolder.getmessagelist()):
         if not localfolder.isuidvalidityok():
-            ui.validityproblem(localfolder, localfolder.getsaveduidvalidity(),
-                               localfolder.getuidvalidity())
+            ui.validityproblem(localfolder)
+           localrepos.restore_atime()
             return
         if not remotefolder.isuidvalidityok():
-            ui.validityproblem(remotefolder, remotefolder.getsaveduidvalidity(),
-                               remotefolder.getuidvalidity())
+            ui.validityproblem(remotefolder)
+           localrepos.restore_atime()
             return
     else:
         localfolder.saveuidvalidity()
@@ -230,4 +232,5 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
     ui.syncingmessages(localrepos, localfolder, statusrepos, statusfolder)
     localfolder.syncmessagesto(statusfolder)
     statusfolder.save()
+    localrepos.restore_atime()