[Zope-Checkins] CVS: Zope/inst - binary_install.py:1.9 build_extensions.py:1.10 build_pcgi.py:1.3 compilezpy.py:1.10 default_content.py:1.7 do.py:1.8 make_instance.py:1.3 make_resource.py:1.7 make_start.py:1.10 walkandscrub.py:1.6
Martijn Pieters
mj@zope.com
Wed, 14 Aug 2002 17:17:33 -0400
Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv8507
Modified Files:
binary_install.py build_extensions.py build_pcgi.py
compilezpy.py default_content.py do.py make_instance.py
make_resource.py make_start.py walkandscrub.py
Log Message:
Clean up indentation and trailing whitespace.
=== Zope/inst/binary_install.py 1.8 => 1.9 ===
--- Zope/inst/binary_install.py:1.8 Wed Nov 28 10:50:50 2001
+++ Zope/inst/binary_install.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Try to do all of the installation steps.
@@ -40,22 +40,22 @@
-p -- Supply the path to the PCGI resource file.
This defaults to %s.
Note that this path must include the file name.
-
+
-g -- Supply the name of the unix group to which
the user that runs your web server belongs.
If not specified, the installer will attempt
to determine the group itself. If no group
is specified and the installer is unable to
determine the group, the install will fail.
-
+
-u -- Supply the name of the unix user used to
run your web server. If not specified, this
defaults to the userid of the current user,
or 'nobody' is the current user is root.
-
+
-h -- Show command summary
""" % (pcgi)
-
+
try: options, args = getopt.getopt(sys.argv[1:], 'p:g:hu:')
except: error(usage, sys.exc_info())
if args: error('', ('Unexpected arguments', args))
=== Zope/inst/build_extensions.py 1.9 => 1.10 ===
--- Zope/inst/build_extensions.py:1.9 Tue Jul 9 13:57:52 2002
+++ Zope/inst/build_extensions.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Build the Zope Extension Modules
@@ -22,4 +22,3 @@
print 'Building extension modules'
do('%s setup.py build_ext -i' % sys.executable)
-
=== Zope/inst/build_pcgi.py 1.2 => 1.3 ===
--- Zope/inst/build_pcgi.py:1.2 Wed Nov 28 10:50:50 2001
+++ Zope/inst/build_pcgi.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Build a PCGI
=== Zope/inst/compilezpy.py 1.9 => 1.10 ===
--- Zope/inst/compilezpy.py:1.9 Wed Aug 14 15:40:17 2002
+++ Zope/inst/compilezpy.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
import compileall, os, sys
@@ -58,7 +58,7 @@
success = 0
import traceback
traceback.print_exc()
-
+
if not success:
print
print '!' * 78
=== Zope/inst/default_content.py 1.6 => 1.7 ===
--- Zope/inst/default_content.py:1.6 Wed Nov 28 10:50:50 2001
+++ Zope/inst/default_content.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
import os
@@ -29,7 +29,3 @@
print 'creating default database'
open(db_path,'wb').write(open(dd_path,'rb').read())
ch(db_path, user, group)
-
-
-
-
=== Zope/inst/do.py 1.7 => 1.8 ===
--- Zope/inst/do.py:1.7 Wed Nov 28 10:50:50 2001
+++ Zope/inst/do.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Shared routines used by the various scripts.
@@ -49,13 +49,13 @@
do("chown %s %s" % (user, path), 0, quiet)
do("chmod %s %s" % (oct(mode), path), 0, quiet)
-
+
def make(*args):
print
print '-'*48
print 'Compiling extensions in %s' % string.join(args,'/')
-
+
for a in args: os.chdir(a)
# Copy over and use the prototype extensions makefile from python dist:
do("cp %s ." % wheres_Makefile_pre_in())
=== Zope/inst/make_instance.py 1.2 => 1.3 ===
--- Zope/inst/make_instance.py:1.2 Mon Jan 14 16:53:57 2002
+++ Zope/inst/make_instance.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Make an INSTANCE_HOME."""
@@ -86,7 +86,7 @@
print
print ('Now to create a starting user. Leave the username '
'blank if you want to skip this step.')
- print
+ print
sys.path.insert(0, home)
choose_inituser(ih)
@@ -100,7 +100,7 @@
username = raw_input("Username: ")
if username == '':
return
-
+
while 1:
pw = getpass.getpass("Password: ")
verify = getpass.getpass("Verify password: ")
=== Zope/inst/make_resource.py 1.6 => 1.7 ===
--- Zope/inst/make_resource.py:1.6 Wed Nov 28 10:50:50 2001
+++ Zope/inst/make_resource.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Build a PCGI resource file.
@@ -39,4 +39,3 @@
''' % vars())
ch(name, user, group, 0755)
-
=== Zope/inst/make_start.py 1.9 => 1.10 ===
--- Zope/inst/make_start.py:1.9 Thu Jul 4 08:12:22 2002
+++ Zope/inst/make_start.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
import sys, os
=== Zope/inst/walkandscrub.py 1.5 => 1.6 ===
--- Zope/inst/walkandscrub.py:1.5 Mon Mar 4 10:11:08 2002
+++ Zope/inst/walkandscrub.py Wed Aug 14 17:17:32 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
import os, sys
@@ -41,7 +41,7 @@
full = os.path.join(dirname, name)
os.unlink(full)
if DEBUG: print full
-
+
if __name__ == '__main__':
DEBUG = 1
walkandscrub(os.getcwd())