Launchpad itself

Merge lp:~jelmer/launchpad/bug531985 into lp:launchpad

  1. bug531985
  2. Merge into devel
Proposed by Jelmer Vernooij on 2010-03-10
Status: Merged
Approved by: Muharem Hrnjadovic on 2010-03-11
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jelmer/launchpad/bug531985
Merge into: lp:launchpad
Diff against target: 43 lines (+6/-7)
2 files modified
lib/lp/soyuz/configure.zcml (+3/-4)
lib/lp/soyuz/interfaces/archive.py (+3/-3)
To merge this branch: bzr merge lp:~jelmer/launchpad/bug531985
Reviewer Review Type Date Requested Status
Muharem Hrnjadovic (community) 2010-03-10 Approve on 2010-03-11
Review via email: mp+21038@code.launchpad.net

Commit Message

Fix permissions on arm_builds_enabled attribute.

Description of the Change

This fixes a regression caused by the ARM-restricted PPA work; like all other attributes that are modifiable from PPA admin forms, use launchpad.Commercial to control the access to arm_builds_enabled.

To post a comment you must log in.
Muharem Hrnjadovic (al-maisan) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/configure.zcml'
2--- lib/lp/soyuz/configure.zcml 2010-03-05 13:52:32 +0000
3+++ lib/lp/soyuz/configure.zcml 2010-03-10 11:09:19 +0000
4@@ -400,12 +400,11 @@
5 <require
6 permission="launchpad.Edit"
7 interface="lp.soyuz.interfaces.archive.IArchiveEdit"
8- set_attributes="description displayname arm_builds_allowed
9- publish"/>
10+ set_attributes="description displayname publish"/>
11 <require
12 permission="launchpad.Commercial"
13- set_attributes="authorized_size buildd_secret
14- external_dependencies private
15+ set_attributes="authorized_size buildd_secret arm_builds_allowed
16+ external_dependencies private
17 require_virtualized relative_build_score "/>
18 <require
19 permission="launchpad.Admin"
20
21=== modified file 'lib/lp/soyuz/interfaces/archive.py'
22--- lib/lp/soyuz/interfaces/archive.py 2010-03-08 18:01:33 +0000
23+++ lib/lp/soyuz/interfaces/archive.py 2010-03-10 11:09:19 +0000
24@@ -279,6 +279,9 @@
25 "context build.\n"
26 "NOTE: This is for migration of OEM PPAs only!"))
27
28+ arm_builds_allowed = Bool(
29+ title=_("Allow ARM builds for this archive"))
30+
31 def getSourcesForDeletion(name=None, status=None, distroseries=None):
32 """All `ISourcePackagePublishingHistory` available for deletion.
33
34@@ -1105,9 +1108,6 @@
35 def disable():
36 """Disable the archive."""
37
38- arm_builds_allowed = Bool(
39- title=_("Allow ARM builds for this archive"))
40-
41
42 class IArchive(IArchivePublic, IArchiveAppend, IArchiveEdit, IArchiveView):
43 """Main Archive interface."""