launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/unbreak-incoming-mail into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #727570 ZCML move breaks incoming mail
  https://bugs.launchpad.net/bugs/727570

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/unbreak-incoming-mail/+merge/51850

r12472 moved script.zcml to zcml/. This broke its inclusion of ../+*.zcml, breaking production incoming mail.

This branch adds the required extra ../.
-- 
https://code.launchpad.net/~wgrant/launchpad/unbreak-incoming-mail/+merge/51850
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/unbreak-incoming-mail into lp:launchpad.

=== modified file 'zcml/script.zcml'
--- zcml/script.zcml	2011-02-18 18:18:20 +0000
+++ zcml/script.zcml	2011-03-02 03:45:23 +0000
@@ -11,7 +11,7 @@
 
     <!-- Add a hook to configure the email stuff using ZCML stored outside
         of the launchpad tree -->
-    <include files="../+*.zcml" />
+    <include files="../../+*.zcml" />
 
     <!-- package-includes/*-configure.zcml contains package configuration
         shared between a normal launchpad instance and the test suite.