Revert restoreatime patch

diff --git a/offlineimap.conf b/offlineimap.conf
index 60bea75707fab591ef04d35e6793c35a6a55ae27..a7c48738833cf2a0fd169a20f97516cd19c11e32 100644 (file)
--- a/offlineimap.conf
+++ b/offlineimap.conf
@@ -188,15 +188,6 @@ localfolders = ~/Test
 
 sep = .
 
-# Some users on *nix platforms may not want the atime (last access
-# time) to be modified by OfflineIMAP.  In these cases, they would
-# want to set restoreatime to yes.  OfflineIMAP will make an effort
-# to not touch the atime if you do that.
-#
-# In most cases, the default of no should be sufficient.
-
-restoreatime = no
-
 [Repository RemoteExample]
 
 # And this is the remote repository.  For now, we only support IMAP here.

diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index 34d7f9d0ba904d3950aac61bd6e7a33e61dd6a32..74791b9a566ecfe1c4e44892047d2e596152e560 100644 (file)
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -154,12 +154,6 @@ class AccountSynchronizationMixin:
 class SyncableAccount(Account, AccountSynchronizationMixin):
     pass
 
-from stat import *
-
-def reset_time(folder, atime, mtime):
-    t = atime, mtime
-    os.utime(folder, t)
-
 def syncfolder(accountname, remoterepos, remotefolder, localrepos,
                statusrepos):
     global mailboxes
@@ -169,9 +163,6 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
     localfolder = localrepos.\
                   getfolder(remotefolder.getvisiblename().\
                             replace(remoterepos.getsep(), localrepos.getsep()))
-    if localrepos.getrestoreatime():
-       cur_atime = os.stat(localfolder.getfullname() + "/cur")[ST_ATIME]
-       new_atime = os.stat(localfolder.getfullname() + "/new")[ST_ATIME]
     # Write the mailboxes
     mbnames.add(accountname, localfolder.getvisiblename())
     # Load local folder
@@ -200,20 +191,10 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
         if not localfolder.isuidvalidityok():
             ui.validityproblem(localfolder, localfolder.getsaveduidvalidity(),
                                localfolder.getuidvalidity())
-           if localrepos.getrestoreatime():
-               reset_time(localfolder.getfullname() + "/new", new_atime, \
-                       os.stat(localfolder.getfullname() + "/new")[ST_MTIME])
-               reset_time(localfolder.getfullname() + "/cur", new_atime, \
-                       os.stat(localfolder.getfullname() + "/cur")[ST_MTIME])
             return
         if not remotefolder.isuidvalidityok():
             ui.validityproblem(remotefolder, remotefolder.getsaveduidvalidity(),
                                remotefolder.getuidvalidity())
-           if localrepos.getrestoreatime():
-               reset_time(localfolder.getfullname() + "/new", new_atime, \
-                       os.stat(localfolder.getfullname() + "/new")[ST_MTIME])
-               reset_time(localfolder.getfullname() + "/cur", new_atime, \
-                       os.stat(localfolder.getfullname() + "/cur")[ST_MTIME])
             return
     else:
         localfolder.saveuidvalidity()
@@ -249,9 +230,4 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos,
     ui.syncingmessages(localrepos, localfolder, statusrepos, statusfolder)
     localfolder.syncmessagesto(statusfolder)
     statusfolder.save()
-    if localrepos.getrestoreatime():
-       reset_time(localfolder.getfullname() + "/new", new_atime, \
-               os.stat(localfolder.getfullname() + "/new")[ST_MTIME])
-       reset_time(localfolder.getfullname() + "/cur", new_atime, \
-               os.stat(localfolder.getfullname() + "/cur")[ST_MTIME])
 

diff --git a/offlineimap/repository/Base.py b/offlineimap/repository/Base.py
index cfca83e108b812109623d14e18c5215d84523d25..9e762007c16f112948295f9a1494696f4cc76628 100644 (file)
--- a/offlineimap/repository/Base.py
+++ b/offlineimap/repository/Base.py
@@ -1,5 +1,5 @@
 # Base repository support
-# Copyright (C) 2002, 2003 John Goerzen
+# Copyright (C) 2002, 2003, 2006 John Goerzen
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify

diff --git a/offlineimap/repository/Maildir.py b/offlineimap/repository/Maildir.py
index d35b0cc50f4d76e9fca6250df1c39b96d1b0028d..a6c305697aa66ebac3e73665bdc304ccf72fb9ca 100644 (file)
--- a/offlineimap/repository/Maildir.py
+++ b/offlineimap/repository/Maildir.py
@@ -33,9 +33,6 @@ class MaildirRepository(BaseRepository):
         self.ui = UIBase.getglobalui()
         self.debug("MaildirRepository initialized, sep is " + repr(self.getsep()))
 
-    def getrestoreatime(self):
-       return self.getconfboolean('restoreatime', 0)
-
     def getlocalroot(self):
         return os.path.expanduser(self.getconf('localfolders'))