1
=== modified file 'buildout.cfg'
2
--- buildout.cfg	2010-09-06 21:13:14 +0000
3
+++ buildout.cfg	2010-10-12 16:01:07 +0000
4
@@ -51,9 +51,9 @@
5
51
interpreter = py
51
interpreter = py
6
52
# Note that any indentation is lost in initialization blocks.
52
# Note that any indentation is lost in initialization blocks.
7
53
initialization =
53
initialization =
11
54
    import os
54
    # See buildout.cfg, [scripts] section, "initialization" key.
12
55
    os.environ.setdefault('LPCONFIG', '${configuration:instance_name}')
55
    from lp_sitecustomize import main
13
56
    import lp_sitecustomize # Initializes LP environment.
56
    main('${configuration:instance_name}') # Initializes LP environment.
14
57
entry-points = stxdocs=zope.configuration.stxdocs:main
57
entry-points = stxdocs=zope.configuration.stxdocs:main
15
58
    googletestservice=canonical.launchpad.testing.googletestservice:main
58
    googletestservice=canonical.launchpad.testing.googletestservice:main
16
59
    windmill=windmill.bin.windmill_bin:main
59
    windmill=windmill.bin.windmill_bin:main
17
60
60
18
=== modified file 'lib/lp_sitecustomize.py'
19
--- lib/lp_sitecustomize.py	2010-09-27 08:46:26 +0000
20
+++ lib/lp_sitecustomize.py	2010-10-12 16:01:07 +0000
21
@@ -87,15 +87,17 @@
22
87
        module="Crypto")
87
        module="Crypto")
23
88
88
24
89
89
34
90
def main():
90
def main(instance_name):
35
91
    # Note that we configure the LPCONFIG environmental variable in the
91
    # This is called by our custom buildout-generated sitecustomize.py
36
92
    # custom buildout-generated sitecustomize.py in
92
    # in parts/scripts/sitecustomize.py. The instance name is sent to
37
93
    # parts/scripts/sitecustomize.py rather than here.  This is because
93
    # buildout from the Makefile, and then inserted into
38
94
    # the instance name, ${configuration:instance_name}, is dynamic,
94
    # sitecustomize.py.  See buildout.cfg in the "initialization" value
39
95
    # sent to buildout from the Makefile.  See buildout.cfg in the
95
    # of the [scripts] section for the code that goes into this custom
40
96
    # initialization value of the [scripts] section for the code that
96
    # sitecustomize.py.  We do all actual initialization here, in a more
41
97
    # goes into this custom sitecustomize.py.  We do as much other
97
    # visible place.
42
98
    # initialization as possible here, in a more visible place.
98
    if instance_name and instance_name != 'development':
43
99
        # See bug 656213 for why we do this carefully.
44
100
        os.environ.setdefault('LPCONFIG', instance_name)
45
99
    os.environ['STORM_CEXTENSIONS'] = '1'
101
    os.environ['STORM_CEXTENSIONS'] = '1'
46
100
    add_custom_loglevels()
102
    add_custom_loglevels()
47
101
    customizeMimetypes()
103
    customizeMimetypes()
48
@@ -109,5 +111,3 @@
49
109
    silence_bzr_logger()
111
    silence_bzr_logger()
50
110
    silence_zcml_logger()
112
    silence_zcml_logger()
51
111
    silence_transaction_logger()
113
    silence_transaction_logger()
52
112
53
113
main()
Reviewer	Review Type	Date Requested	Status
Leonard Richardson (community)		2010-10-12	Approve on 2010-10-12
Review via email: mp+38242@code.launchpad.net
1	=== modified file 'buildout.cfg'
2	--- buildout.cfg 2010-09-06 21:13:14 +0000
3	+++ buildout.cfg 2010-10-12 16:01:07 +0000
4	@@ -51,9 +51,9 @@
5	51	interpreter = py	51	interpreter = py
6	52	# Note that any indentation is lost in initialization blocks.	52	# Note that any indentation is lost in initialization blocks.
7	53	initialization =	53	initialization =
11	54	import os	54	# See buildout.cfg, [scripts] section, "initialization" key.
12	55	os.environ.setdefault('LPCONFIG', '${configuration:instance_name}')	55	from lp_sitecustomize import main
13	56	import lp_sitecustomize # Initializes LP environment.	56	main('${configuration:instance_name}') # Initializes LP environment.
14	57	entry-points = stxdocs=zope.configuration.stxdocs:main	57	entry-points = stxdocs=zope.configuration.stxdocs:main
15	58	googletestservice=canonical.launchpad.testing.googletestservice:main	58	googletestservice=canonical.launchpad.testing.googletestservice:main
16	59	windmill=windmill.bin.windmill_bin:main	59	windmill=windmill.bin.windmill_bin:main
17	60		60
18	=== modified file 'lib/lp_sitecustomize.py'
19	--- lib/lp_sitecustomize.py 2010-09-27 08:46:26 +0000
20	+++ lib/lp_sitecustomize.py 2010-10-12 16:01:07 +0000
21	@@ -87,15 +87,17 @@
22	87	module="Crypto")	87	module="Crypto")
23	88		88
24	89		89
34	90	def main():	90	def main(instance_name):
35	91	# Note that we configure the LPCONFIG environmental variable in the	91	# This is called by our custom buildout-generated sitecustomize.py
36	92	# custom buildout-generated sitecustomize.py in	92	# in parts/scripts/sitecustomize.py. The instance name is sent to
37	93	# parts/scripts/sitecustomize.py rather than here. This is because	93	# buildout from the Makefile, and then inserted into
38	94	# the instance name, ${configuration:instance_name}, is dynamic,	94	# sitecustomize.py. See buildout.cfg in the "initialization" value
39	95	# sent to buildout from the Makefile. See buildout.cfg in the	95	# of the [scripts] section for the code that goes into this custom
40	96	# initialization value of the [scripts] section for the code that	96	# sitecustomize.py. We do all actual initialization here, in a more
41	97	# goes into this custom sitecustomize.py. We do as much other	97	# visible place.
42	98	# initialization as possible here, in a more visible place.	98	if instance_name and instance_name != 'development':
43			99	# See bug 656213 for why we do this carefully.
44			100	os.environ.setdefault('LPCONFIG', instance_name)
45	99	os.environ['STORM_CEXTENSIONS'] = '1'	101	os.environ['STORM_CEXTENSIONS'] = '1'
46	100	add_custom_loglevels()	102	add_custom_loglevels()
47	101	customizeMimetypes()	103	customizeMimetypes()
48	@@ -109,5 +111,3 @@
49	109	silence_bzr_logger()	111	silence_bzr_logger()
50	110	silence_zcml_logger()	112	silence_zcml_logger()
51	111	silence_transaction_logger()	113	silence_transaction_logger()
52	112
53	113	main()