Merge lp:~mars/launchpad/testfix-missing-iarchive-import into lp:launchpad

Proposed by Māris Fogels
Status: Rejected
Rejected by: Māris Fogels
Proposed branch: lp:~mars/launchpad/testfix-missing-iarchive-import
Merge into: lp:launchpad
Diff against target: 11 lines (+1/-0)
1 file modified
lib/canonical/launchpad/security.py (+1/-0)
To merge this branch: bzr merge lp:~mars/launchpad/testfix-missing-iarchive-import
Reviewer Review Type Date Requested Status
Canonical Launchpad Engineering Pending
Review via email: mp+28665@code.launchpad.net

Commit message

Fix a missing import in security.py

Description of the change

Hi,

This branch fixes a missing import in security.py that prevents the 'make build' step from executing. The line in question was accidentally removed in https://code.edge.launchpad.net/~julian-edwards/launchpad/p3a-sub-private-teams-bug-597783/+merge/28621.

Test: make, bin/test -cvv test_archive_subscriptions
Pre-implementation call with: No one
Lint: ?

Maris

To post a comment you must log in.
Revision history for this message
Māris Fogels (mars) wrote :

Paul beat me to the fix by a few minutes, so I'll reject this one.

Unmerged revisions

11070. By Māris Fogels

Testfix for a missing security adapter import that breaks 'make build'.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py 2010-06-28 15:28:45 +0000
+++ lib/canonical/launchpad/security.py 2010-06-28 18:53:29 +0000
@@ -14,6 +14,7 @@
14from canonical.launchpad.interfaces.account import IAccount14from canonical.launchpad.interfaces.account import IAccount
15from canonical.launchpad.interfaces.emailaddress import IEmailAddress15from canonical.launchpad.interfaces.emailaddress import IEmailAddress
16from lp.registry.interfaces.announcement import IAnnouncement16from lp.registry.interfaces.announcement import IAnnouncement
17from lp.soyuz.interfaces.archive import IArchive
17from lp.soyuz.interfaces.archivepermission import (18from lp.soyuz.interfaces.archivepermission import (
18 IArchivePermissionSet)19 IArchivePermissionSet)
19from lp.soyuz.interfaces.archiveauthtoken import IArchiveAuthToken20from lp.soyuz.interfaces.archiveauthtoken import IArchiveAuthToken