launchpad-reviewers team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~gary/launchpad/bug632218 into lp:launchpad.

Requested reviews:
  Graham Binns (gmb)
  Launchpad code reviewers (launchpad-reviewers): release-critical
Related bugs:
  #632218 staging builddmaster is having building woes with permissions - template engine
  https://bugs.launchpad.net/bugs/632218


This is a release-critical branch to fix a critical bug.

The symptoms are described in the bug report.

This fix should work but I'm hoping to get LOSA verification before merging it.
-- 
https://code.launchpad.net/~gary/launchpad/bug632218/+merge/34785
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~gary/launchpad/bug632218 into lp:launchpad.

=== modified file 'Makefile'
--- Makefile	2010-09-07 05:39:39 +0000
+++ Makefile	2010-09-07 18:22:40 +0000
@@ -202,11 +202,14 @@
 	$(SHHH) PYTHONPATH= ./bin/buildout \
                 configuration:instance_name=${LPCONFIG} -c $(BUILDOUT_CFG)
 
+# bin/compile_templates is responsible for building all chameleon templates,
+# of which there is currently one, but of which many more are coming.
 compile: $(PY) $(BZR_VERSION_INFO)
 	mkdir -p /var/tmp/vostok-archive
 	${SHHH} $(MAKE) -C sourcecode build PYTHON=${PYTHON} \
 	    LPCONFIG=${LPCONFIG}
 	${SHHH} LPCONFIG=${LPCONFIG} ${PY} -t buildmailman.py
+	bin/compile_templates
 
 test_build: build
 	bin/test $(TESTFLAGS) $(TESTOPTS)
@@ -337,7 +340,8 @@
 	fi
 	find . -path ./eggs -prune -false -o \
 		-type f \( -name '*.o' -o -name '*.so' -o -name '*.la' -o \
-	    -name '*.lo' -o -name '*.py[co]' -o -name '*.dll' \) \
+	    -name '*.lo' -o -name '*.py[co]' -o -name '*.dll' -o \
+	    -name '*.pt.py' \) \
 	    -print0 | xargs -r0 $(RM)
 	$(RM) thread*.request
 	$(RM) -r lib/mailman

=== modified file 'setup.py'
--- setup.py	2010-07-23 08:50:49 +0000
+++ setup.py	2010-09-07 18:22:40 +0000
@@ -149,6 +149,8 @@
             'start_librarian '
                 '= canonical.launchpad.scripts.runlaunchpad:start_librarian',
             'ec2 = devscripts.ec2test.entrypoint:main',
+            'compile_templates '
+                '= canonical.launchpad.scripts:execute_zcml_for_scripts',
         ]
     ),
 )