#
# 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
import offlineimap.version
import re, time, sys, traceback, threading, thread
def setlogfd(s, logfd):
s.logfile = logfd
- logfd.write("This is %s %s %s\n" % \
+ logfd.write("This is %s %s\n" % \
(offlineimap.version.productname,
- offlineimap.version.versionstr,
- offlineimap.version.revstr))
+ offlineimap.version.versionstr))
logfd.write("Python: %s\n" % sys.version)
logfd.write("Platform: %s\n" % sys.platform)
logfd.write("Args: %s\n" % sys.argv)
s.getnicename(srcrepos),
s.getnicename(destrepos)))
- def validityproblem(s, folder, saved, new):
- s.warn("UID validity problem for folder %s (saved %d; got %d); skipping it" % \
- (folder.getname(), saved, new))
+ def validityproblem(s, folder):
+ s.warn("UID validity problem for folder %s (repo %s) (saved %d; got %d); skipping it" % \
+ (folder.getname(), folder.getrepository().getname(),
+ folder.getsaveduidvalidity(), folder.getuidvalidity()))
def loadmessagelist(s, repos, folder):
if s.verbose > 0:
def mainException(s):
s._msg(s.getMainExceptionString())
- def terminate(s, exitstatus = 0):
+ def terminate(s, exitstatus = 0, errortitle = None, errormsg = None):
"""Called to terminate the application."""
+ if errormsg <> None:
+ if errortitle <> None:
+ sys.stderr.write('ERROR: %s\n\n%s\n'%(errortitle, errormsg))
+ else:
+ sys.stderr.write('%s\n' % errormsg)
sys.exit(exitstatus)
def threadExited(s, thread):