Launchpad itself

Merge lp:~wgrant/launchpad/bug-661109-buildable-architectures into lp:launchpad

  1. bug-661109-buildable-architectures
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: Abel Deuring
Approved revision: no longer in the source branch.
Merged at revision: 11729
Proposed branch: lp:~wgrant/launchpad/bug-661109-buildable-architectures
Merge into: lp:launchpad
Diff against target: 110 lines (+10/-10)
6 files modified
lib/lp/registry/interfaces/distroseries.py (+1/-1)
lib/lp/registry/model/distroseries.py (+1/-1)
lib/lp/soyuz/doc/distroarchseries.txt (+5/-5)
lib/lp/soyuz/model/publishing.py (+1/-1)
lib/lp/soyuz/scripts/buildd.py (+1/-1)
lib/lp/soyuz/scripts/ppa_add_missing_builds.py (+1/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/bug-661109-buildable-architectures
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+38529@code.launchpad.net

Commit message

Rename (I)DistroSeries.enabled_architectures to buildable_architectures.

Description of the change

DistroSeries.enabled_architectures has been around for a while, returning DistroArchSerieses that have chroot tarballs. But a couple of months ago the DistroArchSeries.enabled flag was introduced, making the "enabled_architectures" name rather confusing.

This branch renames (I)DistroSeries.enabled_architectures to buildable_architectures, a more sensible name that leaves enabled_architectures free for the more obvious purpose.

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py 2010-09-28 18:11:41 +0000
+++ lib/lp/registry/interfaces/distroseries.py 2010-10-15 11:03:49 +0000
@@ -382,7 +382,7 @@
382 virtualized_architectures = Attribute(382 virtualized_architectures = Attribute(
383 "All architectures in this series where PPA is supported.")383 "All architectures in this series where PPA is supported.")
384384
385 enabled_architectures = Attribute(385 buildable_architectures = Attribute(
386 "All architectures in this series with available chroot tarball.")386 "All architectures in this series with available chroot tarball.")
387387
388 def __getitem__(archtag):388 def __getitem__(archtag):
389389
=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py 2010-10-03 15:30:06 +0000
+++ lib/lp/registry/model/distroseries.py 2010-10-15 11:03:49 +0000
@@ -349,7 +349,7 @@
349 return None349 return None
350350
351 @property351 @property
352 def enabled_architectures(self):352 def buildable_architectures(self):
353 store = Store.of(self)353 store = Store.of(self)
354 origin = [354 origin = [
355 DistroArchSeries,355 DistroArchSeries,
356356
=== modified file 'lib/lp/soyuz/doc/distroarchseries.txt'
--- lib/lp/soyuz/doc/distroarchseries.txt 2010-10-06 11:46:51 +0000
+++ lib/lp/soyuz/doc/distroarchseries.txt 2010-10-15 11:03:49 +0000
@@ -335,7 +335,7 @@
335 The Hoary Hedgehog Release for hppa (hppa) (ppa)335 The Hoary Hedgehog Release for hppa (hppa) (ppa)
336 The Hoary Hedgehog Release for i386 (x86) (official, ppa)336 The Hoary Hedgehog Release for i386 (x86) (official, ppa)
337337
338There is also `DistroSeries.enabled_architectures` which returns a338There is also `DistroSeries.buildable_architectures` which returns a
339`ResultSet` containing only the `DistroArchSeries` with available339`ResultSet` containing only the `DistroArchSeries` with available
340chroots tarballs (the ones for which we can build packages).340chroots tarballs (the ones for which we can build packages).
341341
@@ -343,14 +343,14 @@
343tarballs. Once it is available the corresponding architecture is343tarballs. Once it is available the corresponding architecture is
344returned.344returned.
345345
346 >>> hoary.enabled_architectures.count()346 >>> hoary.buildable_architectures.count()
347 0347 0
348348
349 # Create a chroot tarball for hoary/hppa.349 # Create a chroot tarball for hoary/hppa.
350 >>> chroot = factory.makeLibraryFileAlias()350 >>> chroot = factory.makeLibraryFileAlias()
351 >>> unused = hoary.getDistroArchSeries('hppa').addOrUpdateChroot(chroot)351 >>> unused = hoary.getDistroArchSeries('hppa').addOrUpdateChroot(chroot)
352352
353 >>> print_architectures(hoary.enabled_architectures)353 >>> print_architectures(hoary.buildable_architectures)
354 The Hoary Hedgehog Release for hppa (hppa) (ppa)354 The Hoary Hedgehog Release for hppa (hppa) (ppa)
355355
356The architecture also has a 'chroot_url' attribute directly referencing356The architecture also has a 'chroot_url' attribute directly referencing
@@ -367,13 +367,13 @@
367 >>> print hoary.getDistroArchSeries('i386').chroot_url367 >>> print hoary.getDistroArchSeries('i386').chroot_url
368 None368 None
369369
370`DistroSeries.enabled_architectures` results are ordered370`DistroSeries.buildable_architectures` results are ordered
371alphabetically by 'architecturetag'.371alphabetically by 'architecturetag'.
372372
373 # Create a chroot tarball for hoary/i386.373 # Create a chroot tarball for hoary/i386.
374 >>> unused = hoary.getDistroArchSeries('i386').addOrUpdateChroot(chroot)374 >>> unused = hoary.getDistroArchSeries('i386').addOrUpdateChroot(chroot)
375375
376 >>> print_architectures(hoary.enabled_architectures)376 >>> print_architectures(hoary.buildable_architectures)
377 The Hoary Hedgehog Release for hppa (hppa) (ppa)377 The Hoary Hedgehog Release for hppa (hppa) (ppa)
378 The Hoary Hedgehog Release for i386 (x86) (official, ppa)378 The Hoary Hedgehog Release for i386 (x86) (official, ppa)
379379
380380
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py 2010-10-14 02:28:19 +0000
+++ lib/lp/soyuz/model/publishing.py 2010-10-15 11:03:49 +0000
@@ -570,7 +570,7 @@
570570
571 if architectures_available is None:571 if architectures_available is None:
572 architectures_available = list(572 architectures_available = list(
573 self.distroseries.enabled_architectures)573 self.distroseries.buildable_architectures)
574574
575 architectures_available = self._getAllowedArchitectures(575 architectures_available = self._getAllowedArchitectures(
576 architectures_available)576 architectures_available)
577577
=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py 2010-10-03 15:30:06 +0000
+++ lib/lp/soyuz/scripts/buildd.py 2010-10-15 11:03:49 +0000
@@ -130,7 +130,7 @@
130 % distroseries.name)130 % distroseries.name)
131 return131 return
132132
133 architectures_available = list(distroseries.enabled_architectures)133 architectures_available = list(distroseries.buildable_architectures)
134 if not architectures_available:134 if not architectures_available:
135 self.logger.debug(135 self.logger.debug(
136 "Chroots missing for %s, skipping" % distroseries.name)136 "Chroots missing for %s, skipping" % distroseries.name)
137137
=== modified file 'lib/lp/soyuz/scripts/ppa_add_missing_builds.py'
--- lib/lp/soyuz/scripts/ppa_add_missing_builds.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/ppa_add_missing_builds.py 2010-10-15 11:03:49 +0000
@@ -31,7 +31,7 @@
31 % distroseries.name)31 % distroseries.name)
32 return32 return
3333
34 architectures_available = set(distroseries.enabled_architectures)34 architectures_available = set(distroseries.buildable_architectures)
35 if not architectures_available:35 if not architectures_available:
36 self.logger.error(36 self.logger.error(
37 "Chroots missing for %s" % distroseries.name)37 "Chroots missing for %s" % distroseries.name)