Merge lp:~stevenk/launchpad/archive-edit-dependencies-oops into lp:launchpad

[Steve Kowalik]

Teach Archive:+edit-dependencies about components other than multiverse. They are now added onto the components vocabulary if they're used.

Teach Archive:+edit-dependencies about components other than multiverse. If an archive has a dependency on the Ubuntu primary archive with a component of main, which can be set via the API, the page will OOPS, since main is not in the vocab that the page builds for components. Extend it to deal with them, and only display them if they are set.

I will claim this LoC against the stacks and stacks I have.

[William Grant (wgrant)]

I'd add a comment to the new code.

review: Approve (code)

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2012-11-13 09:36:41 +0000
+++ lib/lp/soyuz/browser/archive.py	2012-11-26 02:10:26 +0000
@@ -29,7 +29,6 @@
     ]
 
 
-from cgi import escape
 from datetime import (
     datetime,
     timedelta,
@@ -1705,7 +1704,8 @@
          || FOLLOW_PRIMARY ||    None    ||
 
         When omitted in the form, this widget defaults to 'All ubuntu
-        components' option when rendered.
+        components' option when rendered. Other components, such as 'main',
+        or 'contrib' will be added to the list of options if they are used.
         """
         multiverse = getUtility(IComponentSet)['multiverse']
 
@@ -1727,6 +1727,11 @@
             default_value = primary_dependency.component
 
         terms = [all_components, follow_primary]
+        if default_value and default_value != multiverse:
+            current_component = SimpleTerm(
+                default_value, 'OTHER_COMPONENT',
+                _('Unsupported component (%s)' % default_value.name))
+            terms.append(current_component)
         primary_components_vocabulary = SimpleVocabulary(terms)
         current_term = primary_components_vocabulary.getTerm(default_value)
 

=== modified file 'lib/lp/soyuz/model/archivedependency.py'
--- lib/lp/soyuz/model/archivedependency.py	2011-12-30 06:14:56 +0000
+++ lib/lp/soyuz/model/archivedependency.py	2012-11-26 02:10:26 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# pylint: disable-msg=E0611,W0212
-
 """Database class for ArchiveDependency."""
 
 __metaclass__ = type

=== modified file 'lib/lp/soyuz/stories/ppa/xx-edit-dependencies.txt'
--- lib/lp/soyuz/stories/ppa/xx-edit-dependencies.txt	2012-01-15 11:06:57 +0000
+++ lib/lp/soyuz/stories/ppa/xx-edit-dependencies.txt	2012-11-26 02:10:26 +0000
@@ -406,6 +406,34 @@
     (*) Use the same components used for each source in the Ubuntu
         primary archive.
 
+If we set the primary dependency to just main, which can only be done via the
+API or the objects themselves, the form will show it to allow the user to
+change it.
+
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
+    >>> from lp.soyuz.interfaces.component import IComponentSet
+    >>> from lp.testing import login_celebrity
+    >>> ignored = login_celebrity('admin')
+    >>> archive = factory.makeArchive()
+    >>> main = getUtility(IComponentSet)['main']
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu').main_archive
+    >>> ignored = archive.addArchiveDependency(
+    ...     ubuntu, PackagePublishingPocket.RELEASE, component=main)
+    >>> url = canonical_url(archive)
+    >>> logout()
+    >>> admin_browser.open(url)
+    >>> admin_browser.getLink('Edit PPA dependencies').click()
+    >>> print_radio_button_field(
+    ...     admin_browser.contents, 'primary_components')
+    ( ) Use all Ubuntu components available.
+    ( ) Use the same components used for each source in the Ubuntu
+        primary archive.
+    (*) Unsupported component (main)
+    >>> admin_browser.open('http://launchpad.dev/~cprov/+archive/ppa')
+    >>> admin_browser.getLink('Edit PPA dependencies').click()
+
 
 == Everything in one click ==