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

[William Grant]

Rename (I)DistroSeries.enabled_architectures to buildable_architectures.

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.

[Abel Deuring (adeuring)]

review: Approve (code)

=== 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 @@
     virtualized_architectures = Attribute(
         "All architectures in this series where PPA is supported.")
 
-    enabled_architectures = Attribute(
+    buildable_architectures = Attribute(
         "All architectures in this series with available chroot tarball.")
 
     def __getitem__(archtag):

=== 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 @@
         return None
 
     @property
-    def enabled_architectures(self):
+    def buildable_architectures(self):
         store = Store.of(self)
         origin = [
             DistroArchSeries,

=== 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 @@
     The Hoary Hedgehog Release for hppa (hppa) (ppa)
     The Hoary Hedgehog Release for i386 (x86) (official, ppa)
 
-There is also `DistroSeries.enabled_architectures` which returns a
+There is also `DistroSeries.buildable_architectures` which returns a
 `ResultSet` containing only the `DistroArchSeries` with available
 chroots tarballs (the ones for which we can build packages).
 
@@ -343,14 +343,14 @@
 tarballs. Once it is available the corresponding architecture is
 returned.
 
-    >>> hoary.enabled_architectures.count()
+    >>> hoary.buildable_architectures.count()
     0
 
     # Create a chroot tarball for hoary/hppa.
     >>> chroot = factory.makeLibraryFileAlias()
     >>> unused = hoary.getDistroArchSeries('hppa').addOrUpdateChroot(chroot)
 
-    >>> print_architectures(hoary.enabled_architectures)
+    >>> print_architectures(hoary.buildable_architectures)
     The Hoary Hedgehog Release for hppa (hppa) (ppa)
 
 The architecture also has a 'chroot_url' attribute directly referencing
@@ -367,13 +367,13 @@
     >>> print hoary.getDistroArchSeries('i386').chroot_url
     None
 
-`DistroSeries.enabled_architectures` results are ordered
+`DistroSeries.buildable_architectures` results are ordered
 alphabetically by 'architecturetag'.
 
     # Create a chroot tarball for hoary/i386.
     >>> unused = hoary.getDistroArchSeries('i386').addOrUpdateChroot(chroot)
 
-    >>> print_architectures(hoary.enabled_architectures)
+    >>> print_architectures(hoary.buildable_architectures)
     The Hoary Hedgehog Release for hppa (hppa) (ppa)
     The Hoary Hedgehog Release for i386 (x86) (official, ppa)
 

=== 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 @@
 
         if architectures_available is None:
             architectures_available = list(
-                self.distroseries.enabled_architectures)
+                self.distroseries.buildable_architectures)
 
         architectures_available = self._getAllowedArchitectures(
             architectures_available)

=== 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 @@
                 % distroseries.name)
             return
 
-        architectures_available = list(distroseries.enabled_architectures)
+        architectures_available = list(distroseries.buildable_architectures)
         if not architectures_available:
             self.logger.debug(
                 "Chroots missing for %s, skipping" % distroseries.name)

=== 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 @@
                 % distroseries.name)
             return
 
-        architectures_available = set(distroseries.enabled_architectures)
+        architectures_available = set(distroseries.buildable_architectures)
         if not architectures_available:
             self.logger.error(
                 "Chroots missing for %s" % distroseries.name)