Launchpad itself

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

  1. bug531985
  2. Merge into devel
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Muharem Hrnjadovic
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) Approve
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.
Revision history for this message
Muharem Hrnjadovic (al-maisan) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml 2010-03-05 13:52:32 +0000
+++ lib/lp/soyuz/configure.zcml 2010-03-10 11:09:19 +0000
@@ -400,12 +400,11 @@
400 <require400 <require
401 permission="launchpad.Edit"401 permission="launchpad.Edit"
402 interface="lp.soyuz.interfaces.archive.IArchiveEdit"402 interface="lp.soyuz.interfaces.archive.IArchiveEdit"
403 set_attributes="description displayname arm_builds_allowed403 set_attributes="description displayname publish"/>
404 publish"/>
405 <require404 <require
406 permission="launchpad.Commercial"405 permission="launchpad.Commercial"
407 set_attributes="authorized_size buildd_secret406 set_attributes="authorized_size buildd_secret arm_builds_allowed
408 external_dependencies private407 external_dependencies private
409 require_virtualized relative_build_score "/>408 require_virtualized relative_build_score "/>
410 <require409 <require
411 permission="launchpad.Admin"410 permission="launchpad.Admin"
412411
=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py 2010-03-08 18:01:33 +0000
+++ lib/lp/soyuz/interfaces/archive.py 2010-03-10 11:09:19 +0000
@@ -279,6 +279,9 @@
279 "context build.\n"279 "context build.\n"
280 "NOTE: This is for migration of OEM PPAs only!"))280 "NOTE: This is for migration of OEM PPAs only!"))
281281
282 arm_builds_allowed = Bool(
283 title=_("Allow ARM builds for this archive"))
284
282 def getSourcesForDeletion(name=None, status=None, distroseries=None):285 def getSourcesForDeletion(name=None, status=None, distroseries=None):
283 """All `ISourcePackagePublishingHistory` available for deletion.286 """All `ISourcePackagePublishingHistory` available for deletion.
284287
@@ -1105,9 +1108,6 @@
1105 def disable():1108 def disable():
1106 """Disable the archive."""1109 """Disable the archive."""
11071110
1108 arm_builds_allowed = Bool(
1109 title=_("Allow ARM builds for this archive"))
1110
11111111
1112class IArchive(IArchivePublic, IArchiveAppend, IArchiveEdit, IArchiveView):1112class IArchive(IArchivePublic, IArchiveAppend, IArchiveEdit, IArchiveView):
1113 """Main Archive interface."""1113 """Main Archive interface."""