[Zope-Checkins] CVS: Zope/inst - configure.py:1.8

[Chris McDonough]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv19571/inst

Modified Files:
	configure.py 
Log Message:
Make --quiet quieter.


=== Zope/inst/configure.py 1.7 => 1.8 ===
--- Zope/inst/configure.py:1.7	Thu Jun 12 23:55:22 2003
+++ Zope/inst/configure.py	Fri Jun 13 12:43:05 2003
@@ -16,9 +16,10 @@
 import getopt
 import os
 import sys
-
 import versions
 
+QUIET=0
+
 if sys.platform == 'win32':
     PREFIX = 'c:\\Zope-' + versions.ZOPE_MAJOR_VERSION
     IN_MAKEFILE = 'Makefile.win.in'
@@ -63,13 +64,15 @@
             BUILD_BASE = a
         if o == '--quiet':
             DISTUTILS_OPTS = '-q'
+            global QUIET
+            QUIET = 1
     if REQUIRE_LF_ENABLED:
         test_largefile()
     if REQUIRE_ZLIB:
         test_zlib()
-    print "  - Zope top-level binary directory will be %s." % PREFIX
+    out("  - Zope top-level binary directory will be %s." % PREFIX)
     if INSTALL_FLAGS:
-        print "  - Distutils install flags will be '%s'" % INSTALL_FLAGS
+        out("  - Distutils install flags will be '%s'" % INSTALL_FLAGS)
     idata = {
         '<<PYTHON>>':PYTHON,
         '<<PREFIX>>':PREFIX,
@@ -85,10 +88,10 @@
         MAKEFILE = MAKEFILE.replace(k, v)
     f = open(os.path.join(os.getcwd(), 'makefile'), 'w')
     f.write(MAKEFILE)
-    print "  - Makefile written."
-    print
-    print "  Next, run %s." % MAKE_COMMAND
-    print
+    out("  - Makefile written.")
+    out("")
+    out("  Next, run %s." % MAKE_COMMAND)
+    out("")
 
 def usage():
     usage = ("""
@@ -180,5 +183,9 @@
         )
     sys.exit(1)
 
+def out(s):
+    if not QUIET:
+        print s
+    
 if __name__ == '__main__':
     main()