Launchpad itself

Merge lp:~bac/launchpad/bug-604488 into lp:launchpad

  1. bug-604488
  2. Merge into devel
Proposed by Brad Crittenden
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 11119
Proposed branch: lp:~bac/launchpad/bug-604488
Merge into: lp:launchpad
Diff against target: 40 lines (+4/-3)
3 files modified
lib/canonical/configure.zcml (+2/-1)
lib/lp/services/salesforce/configure.zcml (+1/-1)
lib/lp/services/salesforce/interfaces.py (+1/-1)
To merge this branch: bzr merge lp:~bac/launchpad/bug-604488
Reviewer Review Type Date Requested Status
Curtis Hovey (community) Approve
Review via email: mp+29675@code.launchpad.net

Commit message

Register missing zcml for production.

Description of the change

= Summary =

Refactoring of salesforce proxy code created a new configure.zcml file
that was not registered.

== Proposed fix ==

Add registration information to lib/canonical/configure.zcml

== Pre-implementation notes ==

Talk with Curtis.

== Implementation details ==

As above.

== Tests ==

None, as all testing uses zcml overrides and therefore didn't fail as
they were handled properly.

== Demo and Q/A ==

Visit https://launchpad.net/people/+me/+vouchers.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/canonical/configure.zcml
  lib/lp/services/salesforce/configure.zcml
  lib/lp/services/salesforce/interfaces.py

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thanks for identifying the problem. The test you demonstrated from make harness convinced me that this is the correct fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/configure.zcml'
2--- lib/canonical/configure.zcml 2010-03-24 15:22:26 +0000
3+++ lib/canonical/configure.zcml 2010-07-12 08:41:09 +0000
4@@ -22,6 +22,7 @@
5 <include package="lp.services.memcache" />
6 <include package="lp.services.scripts" />
7 <include package="lp.services.worlddata" />
8+ <include package="lp.services.salesforce" />
9 <include package="lazr.uri" />
10 <include package="canonical.librarian" />
11
12@@ -75,7 +76,7 @@
13 virtual host layers. The directives come in pairs.
14 The separate registration for the resources namespace (@@) is needed
15 because otherwise the lookup for /@@/ will fail because the
16- layer-specific defaultView directive also registers the
17+ layer-specific defaultView directive also registers the
18 default view name as an unnamed adapter.
19 -->
20 -->
21
22=== modified file 'lib/lp/services/salesforce/configure.zcml'
23--- lib/lp/services/salesforce/configure.zcml 2010-07-07 19:41:07 +0000
24+++ lib/lp/services/salesforce/configure.zcml 2010-07-12 08:41:09 +0000
25@@ -1,4 +1,4 @@
26-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
27+<!-- Copyright 2010 Canonical Ltd. This software is licensed under the
28 GNU Affero General Public License version 3 (see the file LICENSE).
29 -->
30
31
32=== modified file 'lib/lp/services/salesforce/interfaces.py'
33--- lib/lp/services/salesforce/interfaces.py 2010-07-07 19:41:07 +0000
34+++ lib/lp/services/salesforce/interfaces.py 2010-07-12 08:41:09 +0000
35@@ -1,4 +1,4 @@
36-# Copyright 2009 Canonical Ltd. This software is licensed under the
37+# Copyright 2010 Canonical Ltd. This software is licensed under the
38 # GNU Affero General Public License version 3 (see the file LICENSE).
39
40 # pylint: disable-msg=E0211,E0213