changeset 4926:7a8e1567e7e4

removed moin account check's --lastsaved option, it is default now (checking last use with trail file did not work in 1.9 anyway)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 01 Aug 2009 18:10:46 +0200
parents c37ea194d626
children 27d5d0b875a9
files MoinMoin/script/account/check.py
diffstat 1 files changed, 1 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/script/account/check.py	Thu Jul 30 17:43:50 2009 +0200
+++ b/MoinMoin/script/account/check.py	Sat Aug 01 18:10:46 2009 +0200
@@ -87,12 +87,6 @@
         self._addFlag("wikinames",
             "Convert user account names to wikinames (camel-case)."
         )
-        self._addFlag("lastsaved",
-            "Normally the account most recently USED will"
-            " survive and the others will be disabled."
-            " Using --lastsaved, the account most recently"
-            " SAVED will survive."
-        )
         self._addFlag("save",
             "If specified as LAST option, will allow the other"
             " options to save user accounts back to disk."
@@ -154,15 +148,7 @@
                 print "- would be disabled."
 
     def getsortvalue(self, uid, user):
-        t_ls = float(user.last_saved) # when user did last SAVE of his account data
-        if self.options.lastsaved:
-            return t_ls
-        else: # last USED (we check the page trail for that)
-            try:
-                t_lu = float(os.path.getmtime(os.path.join(self.request.cfg.user_dir, "%s.trail" % uid)))
-            except OSError:
-                t_lu = t_ls # better than having nothing
-            return t_lu
+        return float(user.last_saved) # when user did last SAVE of his account data
 
     def process(self, uidlist):
         sortlist = []