[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/regressiontests - loadmail.py:1.7.4.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/regressiontests
In directory cvs.zope.org:/tmp/cvs-serv9237/lib/python/Products/ZCatalog/regressiontests

Modified Files:
      Tag: chrism-install-branch
	loadmail.py 
Log Message:
Merging with HEAD.


=== Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py 1.7.4.1 => 1.7.4.2 ===
--- Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py:1.7.4.1	Mon Aug 26 02:22:37 2002
+++ Zope/lib/python/Products/ZCatalog/regressiontests/loadmail.py	Mon Sep 16 02:00:52 2002
@@ -213,7 +213,10 @@
         app=jar.root()['Application']
         mdest=getattr(app, name)
         if i%100 == 0 and printstat:
-            sys.stdout.write("\t%s\t%s\t\r" % (i, f.tell()))
+            fmt = "\t%s\t%s\t\r"
+            if os.environ.get('TERM') in ('dumb', 'emacs'):
+                fmt = "\t%s\t%s\t\n"
+            sys.stdout.write(fmt % (i, f.tell()))
             sys.stdout.flush()
 
         did=str(i)