UID validity diagnostics improvement

* Reduced the number of parameters passed to ui.validityproblem() because they were all just method-calls to the folder object, which is already passed as the first parameter (reduction of unnecessary complexity).

* Improved the diagnostic message for an 'UID validity problem' by including the name of the repository in which the folder resides; previously it was not possible to determine from the diagnostic alone on which side the problem was.
This commit is contained in:
David Favro 2007-03-15 05:41:43 +01:00
parent 657b470d74
commit b06845fc70

View File

@ -2,6 +2,8 @@
# Copyright (C) 2002 John Goerzen # Copyright (C) 2002 John Goerzen
# <jgoerzen@complete.org> # <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 # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or
@ -208,9 +210,10 @@ class UIBase:
s.getnicename(srcrepos), s.getnicename(srcrepos),
s.getnicename(destrepos))) s.getnicename(destrepos)))
def validityproblem(s, folder, saved, new): def validityproblem(s, folder):
s.warn("UID validity problem for folder %s (saved %d; got %d); skipping it" % \ s.warn("UID validity problem for folder %s (repo %s) (saved %d; got %d); skipping it" % \
(folder.getname(), saved, new)) (folder.getname(), folder.getrepository().getname(),
folder.getsaveduidvalidity(), folder.getuidvalidity()))
def loadmessagelist(s, repos, folder): def loadmessagelist(s, repos, folder):
if s.verbose > 0: if s.verbose > 0: