[Zodb-checkins] CVS: ZODB3/Tools - zeoup.py:1.12

[Guido van Rossum]

Update of /cvs-repository/ZODB3/Tools
In directory cvs.zope.org:/tmp/cvs-serv31250

Modified Files:
	zeoup.py 
Log Message:
Fix bogosities in error reporting.
Add -S to usage message.


=== ZODB3/Tools/zeoup.py 1.11 => 1.12 ===
--- ZODB3/Tools/zeoup.py:1.11	Mon Nov 18 16:40:22 2002
+++ ZODB3/Tools/zeoup.py	Tue Nov 19 20:51:40 2002
@@ -14,6 +14,8 @@
     -p port -- port to connect to
     
     -h host -- host to connect to (default is current host)
+
+    -S storage -- storage name (default '1')
     
     -U path -- Unix-domain socket to connect to
 
@@ -95,7 +97,10 @@
             elif o == '-1':
                 ZEO_VERSION = 1
     except Exception, err:
-        print err
+        s = str(err)
+        if s:
+            s = ": " + s
+        print err.__class__.__name__ + s
         usage()
 
     if unix is not None:
@@ -112,6 +117,11 @@
 if __name__ == "__main__":
     try:
         main()
+    except SystemExit:
+        raise
     except Exception, err:
-        print err
+        s = str(err)
+        if s:
+            s = ": " + s
+        print err.__class__.__name__ + s
         sys.exit(1)