Merge lp:~sinzui/launchpad/distro-driver into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to enable distro drivers to manage their series.
It introduces two marker interfaces IBaseDistribution and
IDerivativeDistribution to allow us to set separate permission on instances
of Distribution.

    lp:~sinzui/launchpad/distro-driver
    Diff size: 708
    Launchpad bug: https://bugs.launchpad.net/bugs/distro-driver
    Test command: ./bin/test -vv \
        -t "registry.*("milestone-views|distroseries-views|xx-distroseries-edit)' \
        -t "registry.*doc/(distroseries|productseries)"
    Pre-implementation: flacoste
    Target release: 2.2.8

= Enable distro drivers to manage their series =

Distro drivers for needs the same privileges as project drivers to do
their job, but they cannot because some aspects of creating a distro
series require lots of back end preparation. This problem only affects
Ubuntu because it uses Soyuz and Translations, so the limitation
should only affect Ubuntu.

Assuming that Ubuntu is an exception then, distro drivers need the power
to create a series and doing so make them the series release manager. The
release manager can create and modify milestones.

== Rules ==

Updated the permission rules of distroseries and milestones.
    * A distro.driver may create a series and he is automatically
      made the series.driver (AKA release manager)
      * Requires a new security permission
    * The series.driver may create milestones and modify milestones
      * requires an update to the existing permission

The Ubuntu exception is difficult in the case of adding a series because
security.py permissions are based on object type, not instances. and the
permission exception is only in regards to creating a series. The solution
suggest by Francis is to add marker interfaces based on the instance during
the SQLObject __init() phase. This is the same solution used by Archive.

ADDENDUM

When a product driver creates a series, he should be the series driver too.
A derivative distribution series must allow the driver to set the status.

== QA ==

    * Ask the owner of Baltix to create the series he needs.
    * Ask the owner of Baltix to update his two current milestones by
      assigning them to one of his series
    * Ask the owner of Baltix to create a milestone.

== Lint ==

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/security.py
  lib/lp/registry/configure.zcml
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/distroseries.py
  lib/lp/registry/browser/product.py
  lib/lp/registry/browser/tests/distroseries-views.txt
  lib/lp/registry/browser/tests/milestone-views.txt
  lib/lp/registry/doc/distroseries.txt
  lib/lp/registry/doc/productseries.txt
  lib/lp/registry/interfaces/distribution.py
  lib/lp/registry/model/distribution.py
  lib/lp/registry/model/product.py

== Test ==

    * lib/lp/registry/browser/tests/distroseries-views.txt
      * Added tests to verify that IDerivativeDistribution drivers can
        create series and edit the series that they are drivers of.
        IBaseDistribution drivers cannot.
    * lib/lp/registry/brow...

[Deryck Hodge (deryck)]

Hi, Curtis.

As I mentioned on IRC, because of https://dev.launchpad.net/LaunchpadSecurityPolicy
and the creation of DriveDistributionByDriversOrOwnersOrAdmins,
I did wonder if that should be moved to an app-specific security.py file.
As you noted, "Not until there a real plan to do this. This is foundations task."
I only mention it here for the sake of completeness.

Otherwise, this looks very good.

Cheers,
deryck

review: Approve

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2009-08-05 14:52:50 +0000
+++ lib/canonical/launchpad/security.py	2009-08-10 00:54:34 +0000
@@ -765,6 +765,25 @@
                 user.inTeam(admins))
 
 
+class DriveDistributionByDriversOrOwnersOrAdmins(AuthorizationBase):
+    """Distribution drivers, owners, and admins may plan releases.
+
+    Drivers of `IDerivativeDistribution`s can create series. Owners and
+    admins can create series for all `IDistribution`s.
+    """
+    permission = 'launchpad.Driver'
+    usedfor = IDistribution
+
+    def checkAuthenticated(self, user):
+        if user.inTeam(self.obj.driver) and not self.obj.full_functionality:
+            # Drivers of derivative distributions can create a series that
+            # they will be the release manager for.
+            return True
+        admins = getUtility(ILaunchpadCelebrities).admin
+        return (user.inTeam(self.obj.owner) or
+                user.inTeam(admins))
+
+
 class EditDistributionSourcePackageByDistroOwnersOrAdmins(AuthorizationBase):
     """The owner of a distribution should be able to edit its source
     package information"""
@@ -803,6 +822,11 @@
     usedfor = IDistroSeries
 
     def checkAuthenticated(self, user):
+        if (user.inTeam(self.obj.driver)
+            and not self.obj.distribution.full_functionality):
+            # The series driver (release manager) may edit a series if the
+            # distribution is an `IDerivativeDistribution`
+            return True
         admins = getUtility(ILaunchpadCelebrities).admin
         return (user.inTeam(self.obj.owner) or
                 user.inTeam(self.obj.distribution.owner) or

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-08-06 18:17:49 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-08-09 18:01:59 +0000
@@ -1948,6 +1948,16 @@
         permission="launchpad.Admin"
         template="../templates/distroseries-add.pt">
     </browser:page>
+
+    <browser:page
+        name="+addseries"
+        for="lp.registry.interfaces.distribution.IDerivativeDistribution"
+        class="lp.registry.browser.distroseries.DistroSeriesAddView"
+        facet="overview"
+        permission="launchpad.Driver"
+        template="../templates/distroseries-add.pt">
+    </browser:page>
+
     <browser:page
         for="lp.registry.interfaces.distribution.IDistribution"
         permission="launchpad.Edit"

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2009-07-17 18:46:25 +0000
+++ lib/lp/registry/browser/distroseries.py	2009-08-10 05:33:31 +0000
@@ -267,6 +267,47 @@
         return self.context.searchPackages(self.text)
 
 
+class DistroSeriesStatusMixin:
+    """A mixin that provides status field support."""
+
+    def createStatusField(self):
+        """Create the 'status' field.
+
+        Create the status vocabulary according the current distroseries
+        status:
+         * stable   -> CURRENT, SUPPORTED, OBSOLETE
+         * unstable -> EXPERIMENTAL, DEVELOPMENT, FROZEN, FUTURE, CURRENT
+        """
+        stable_status = (
+            DistroSeriesStatus.CURRENT,
+            DistroSeriesStatus.SUPPORTED,
+            DistroSeriesStatus.OBSOLETE,
+            )
+
+        if self.context.status not in stable_status:
+            terms = [status for status in DistroSeriesStatus.items
+                     if status not in stable_status]
+            terms.append(DistroSeriesStatus.CURRENT)
+        else:
+            terms = stable_status
+
+        status_vocabulary = SimpleVocabulary(
+            [SimpleTerm(item, item.name, item.title) for item in terms])
+
+        return form.Fields(
+            Choice(__name__='status',
+                   title=_('Status'),
+                   vocabulary=status_vocabulary,
+                   description=_("Select the distroseries status."),
+                   required=True))
+
+    def updateDateReleased(self, status):
+        """Update the datereleased field if the status is set to CURRENT."""
+        if (self.context.datereleased is None and
+            status == DistroSeriesStatus.CURRENT):
+            self.context.datereleased = UTC_NOW
+
+
 class DistroSeriesView(BuildRecordsView, QueueItemsView):
 
     def initialize(self):
@@ -308,33 +349,44 @@
         return True
 
 
-class DistroSeriesEditView(LaunchpadEditFormView):
+class DistroSeriesEditView(LaunchpadEditFormView, DistroSeriesStatusMixin):
     """View class that lets you edit a DistroSeries object.
 
     It redirects to the main distroseries page after a successful edit.
     """
     schema = IDistroSeries
     field_names = ['displayname', 'title', 'summary', 'description']
-
-    def initialize(self):
-        """See `LaunchpadEditFormView`.
-
-        Additionally set the 'label' attribute which will be used in the
-        template.
+    custom_widget('status', LaunchpadDropdownWidget)
+
+    @property
+    def label(self):
+        """See `LaunchpadFormView`."""
+        return 'Change %s details' % self.context.title
+
+    def setUpFields(self):
+        """See `LaunchpadFormView`.
+
+        In addition to setting schema fields, also initialize the
+        'status' field. See `createStatusField` method.
         """
-        LaunchpadEditFormView.initialize(self)
-        self.label = 'Change %s details' % self.context.title
+        LaunchpadEditFormView.setUpFields(self)
+        if not self.context.distribution.full_functionality:
+            # This is an IDerivativeDistribution which may set its status.
+            self.form_fields = (
+                self.form_fields + self.createStatusField())
 
     @action("Change")
     def change_action(self, action, data):
         """Update the context and redirects to its overviw page."""
+        if not self.context.distribution.full_functionality:
+                self.updateDateReleased(data.get('status'))
         self.updateContextFromData(data)
         self.request.response.addInfoNotification(
             'Your changes have been applied.')
         self.next_url = canonical_url(self.context)
 
 
-class DistroSeriesAdminView(LaunchpadEditFormView):
+class DistroSeriesAdminView(LaunchpadEditFormView, DistroSeriesStatusMixin):
     """View class for administering a DistroSeries object.
 
     It redirects to the main distroseries page after a successful edit.
@@ -343,14 +395,10 @@
     field_names = ['name', 'version', 'changeslist']
     custom_widget('status', LaunchpadDropdownWidget)
 
-    def initialize(self):
-        """See `LaunchpadEditFormView`.
-
-        Additionally set the 'label' attribute which will be used in the
-        template.
-        """
-        LaunchpadEditFormView.initialize(self)
-        self.label = 'Administer %s' % self.context.title
+    @property
+    def label(self):
+        """See `LaunchpadFormView`."""
+        return 'Administer %s' % self.context.title
 
     def setUpFields(self):
         """Override `LaunchpadFormView`.
@@ -362,37 +410,6 @@
         self.form_fields = (
             self.form_fields + self.createStatusField())
 
-    def createStatusField(self):
-        """Create the 'status' field.
-
-        Create the status vocabulary according the current distroseries
-        status:
-         * stable   -> CURRENT, SUPPORTED, OBSOLETE
-         * unstable -> EXPERIMENTAL, DEVELOPMENT, FROZEN, FUTURE, CURRENT
-        """
-        stable_status = (
-            DistroSeriesStatus.CURRENT,
-            DistroSeriesStatus.SUPPORTED,
-            DistroSeriesStatus.OBSOLETE,
-            )
-
-        if self.context.status not in stable_status:
-            terms = [status for status in DistroSeriesStatus.items
-                     if status not in stable_status]
-            terms.append(DistroSeriesStatus.CURRENT)
-        else:
-            terms = stable_status
-
-        status_vocabulary = SimpleVocabulary(
-            [SimpleTerm(item, item.name, item.title) for item in terms])
-
-        return form.Fields(
-            Choice(__name__='status',
-                   title=_('Status'),
-                   vocabulary=status_vocabulary,
-                   description=_("Select the distroseries status."),
-                   required=True))
-
     @action("Change")
     def change_action(self, action, data):
         """Update the context and redirects to its overviw page.
@@ -400,11 +417,7 @@
         Also, set 'datereleased' when a unstable distroseries is made
         CURRENT.
         """
-        status = data.get('status')
-        if (self.context.datereleased is None and
-            status == DistroSeriesStatus.CURRENT):
-            self.context.datereleased = UTC_NOW
-
+        self.updateDateReleased(data.get('status'))
         self.updateContextFromData(data)
 
         self.request.response.addInfoNotification(

=== modified file 'lib/lp/registry/browser/tests/distroseries-views.txt'
--- lib/lp/registry/browser/tests/distroseries-views.txt	2009-08-01 15:40:52 +0000
+++ lib/lp/registry/browser/tests/distroseries-views.txt	2009-08-10 05:33:31 +0000
@@ -1,4 +1,5 @@
-= DistroSeries view classes =
+DistroSeries view classes
+=========================
 
     >>> from zope.component import getMultiAdapter
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
@@ -137,11 +138,44 @@
     True
 
 
+Editing distroseries
+--------------------
+
+The distroseries edit view allows the editor to change series. The form
+uses the displayname, title, and description fields.
+
+    >>> view = create_initialized_view(hoary, '+edit')
+    >>> print view.label
+    Change The Hoary Hedgehog Release details
+
+    >>> [field.__name__ for field in view.form_fields]
+    ['displayname', 'title', 'summary', 'description']
+
+Series that belong to derivative distributions also contain the status field.
+
+    >>> youbuntu = factory.makeDistribution(name='youbuntu')
+    >>> yo_series = factory.makeDistroRelease(name='melon')
+    >>> youbuntu.full_functionality
+    False
+
+    >>> yo_driver = factory.makePerson(name='yo-driver')
+    >>> youbuntu.driver = yo_driver
+    >>> login_person(yo_driver)
+    >>> view = create_initialized_view(yo_series, '+edit')
+    >>> print view.label
+    Change ... details
+
+    >>> [field.__name__ for field in view.form_fields]
+    ['displayname', 'title', 'summary', 'description', 'status']
+
+
 Creating distroseries
 ---------------------
 
 A distroseries is created using the distroseries view.
 
+    >>> login('[e-mail]')
+
     >>> view = create_view(ubuntu, '+addseries')
     >>> print view.page_title
     Register a series in Ubuntu
@@ -179,11 +213,94 @@
     # Save this series to test name and version constraints.
     >>> transaction.commit()
 
+
+Drivers can create distroseries
+-------------------------------
+
+Users who are appointed as drivers of a distribution can create a series.
+Most distributions are an `IDerivativeDistribution`.
+
+    >>> from canonical.launchpad.webapp.authorization import check_permission
+
+    >>> login_person(yo_driver)
+    >>> view = create_view(youbuntu, name='+addseries')
+    >>> check_permission('launchpad.Driver', view)
+    True
+
+    >>> yo_form = dict(form)
+    >>> yo_form['field.name'] = 'island'
+    >>> yo_form['field.displayname'] = 'Island'
+    >>> yo_form['field.title'] = 'YouBuntu Island'
+    >>> view = create_initialized_view(
+    ...     youbuntu, name='+addseries', form=yo_form, principal=yo_driver)
+    >>> view.errors
+    []
+
+    >>> yo_series = youbuntu.getSeries('island')
+    >>> print yo_series.displayname
+    Island
+
+Ubuntu is an exception. It's drivers cannot create series because Ubuntu
+is an `IBaseDistribution`.
+
+    >>> ubuntu.full_functionality
+    True
+
+    >>> login_person(ubuntu.owner.teamowner)
+    >>> ubuntu.driver = yo_driver
+    >>> login_person(yo_driver)
+    >>> view = create_view(youbuntu, name='+addseries')
+    >>> check_permission('launchpad.Edit', view)
+    False
+
+
+Editing Distroseries
+--------------------
+
+The series driver (release manager) can edit a series if the series belongs
+to a `IDerivativeDistribution`.
+
+    >>> print yo_series.driver.name
+    yo-driver
+
+    >>> login_person(yo_driver)
+    >>> view = create_view(yo_series, name='+edit')
+    >>> check_permission('launchpad.Edit', view)
+    True
+
+    >>> yo_form = dict(form)
+    >>> del yo_form['field.actions.create']
+    >>> yo_form['field.displayname'] = 'Mountain'
+    >>> yo_form['field.title'] = 'YouBuntu Mountain'
+    >>> yo_form['field.summary'] = 'Mountain summary'
+    >>> yo_form['field.description'] = 'Mountain description'
+    >>> yo_form['field.actions.change'] = 'Change'
+    >>> view = create_initialized_view(
+    ...     yo_series, name='+edit', form=yo_form, principal=yo_driver)
+    >>> view.errors
+    []
+
+    >>> print yo_series.displayname
+    Mountain
+
+Drivers of an `IBaseDistribution` such as Ubuntu cannot edit a series.
+
+    >>> login_person(ubuntu.owner.teamowner)
+    >>> hoary.driver = yo_driver
+    >>> login_person(yo_driver)
+
+    >>> view = create_view(hoary, name='+edit')
+    >>> check_permission('launchpad.Edit', view)
+    False
+
+
 Distroseries name
 -----------------
 
 The distroseries name is unique.
 
+    >>> login('[e-mail]')
+
     >>> form['field.name'] = 'sane'
     >>> form['field.version'] = '2009.07'
     >>> view = create_initialized_view(ubuntu, '+addseries', form=form)

=== modified file 'lib/lp/registry/browser/tests/milestone-views.txt'
--- lib/lp/registry/browser/tests/milestone-views.txt	2009-06-13 15:23:18 +0000
+++ lib/lp/registry/browser/tests/milestone-views.txt	2009-08-10 02:29:03 +0000
@@ -361,11 +361,58 @@
     1.1 None None
 
 
-== Deleting milestones ==
+Distroseries driver and milestones
+----------------------------------
+
+The driver of a series that belongs to an `IDerivativeDistribution` is a
+release manager and can create milestones.
+
+    >>> distroseries = factory.makeDistroRelease(name='pumpkin')
+    >>> driver = factory.makePerson(name='a-driver')
+    >>> distroseries.driver = driver
+    >>> login_person(driver)
+
+    >>> form = {
+    ...     'field.name': 'pie',
+    ...     'field.actions.register': 'Register Milestone',
+    ...     }
+    >>> view = create_initialized_view(
+    ...     distroseries, '+addmilestone', form=form)
+    >>> milestone = distroseries.milestones[0]
+    >>> print milestone.name
+    pie
+
+The driver has access to the milestone.
+
+    >>> view = create_initialized_view(milestone, '+edit')
+    >>> check_permission('launchpad.Edit', view)
+    True
+
+The driver of an `IBaseDistribution` such as Ubuntu cannot create a milestone.
+
+    >>> login_person(ubuntu_distro.owner.teamowner)
+    >>> hoary_series.driver = driver
+    >>> login_person(driver)
+
+    >>> view = create_initialized_view(hoary_series, '+addmilestone')
+    >>> check_permission('launchpad.Edit', view)
+    False
+
+Nor can the driver edit it.
+
+    >>> milestone = factory.makeMilestone(distribution=ubuntu_distro)
+    >>> view = create_initialized_view(milestone, '+edit')
+    >>> check_permission('launchpad.Edit', view)
+    False
+
+
+Deleting milestones
+-------------------
 
 The DeleteMilestoneView allows users to edit permissions to delete Milestones.
 The view is restricted to owners of the project and drivers of the series.
 
+    >>> login_person(owner)
     >>> milestone = firefox_1_0.newMilestone('1.0.10')
     >>> print milestone.name
     1.0.10

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2009-08-05 01:53:16 +0000
+++ lib/lp/registry/configure.zcml	2009-08-09 18:01:59 +0000
@@ -1360,6 +1360,9 @@
             permission="launchpad.Edit"
             interface="lp.registry.interfaces.distribution.IDistributionEditRestricted"/>
         <require
+            permission="launchpad.Driver"
+            interface="lp.registry.interfaces.distribution.IDistributionDriverRestricted"/>
+        <require
             permission="launchpad.Edit"
             set_attributes="displayname title summary description                                                                                         translation_focus translationgroup translationpermission                                                                                         driver members owner security_contact mirror_admin                                                                                         homepage_content icon logo mugshot enable_bug_expiration                                                                                         bug_reporting_guidelines official_blueprints                                                                                         official_malone official_rosetta official_answers                                                                                         official_bug_tags"/>
         <require

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2009-07-24 12:55:03 +0000
+++ lib/lp/registry/doc/distroseries.txt	2009-08-10 03:39:09 +0000
@@ -1,4 +1,4 @@
-= Distro Releases =
+= DistroSeries =
 
 From the DerivationOverview spec
 <https://launchpad.canonical.com/DerivationOverview>:
@@ -762,7 +762,75 @@
     (u'mozilla-firefox-data', u'0.9')
 
 
-= Specification Listings =
+Creating DistroSeries
+---------------------
+
+Users with launchpad.Driver permission may create DistroSeries. In the
+case of an `IDerivativeDistribution` A user who is a driver can create
+the series and he is automatically assigned to the series' driver role
+so that he can edit it.
+
+    >>> youbuntu = factory.makeDistribution(name='youbuntu')
+    >>> yo_driver = factory.makePerson(name='yo-driver')
+    >>> youbuntu.driver = yo_driver
+    >>> login_person(yo_driver)
+    >>> youbuntu.full_functionality
+    False
+
+    >>> yo_series = youbuntu.newSeries(
+    ...     name='island', displayname='Island', title='YouBuntu Island',
+    ...     summary='summary', description='description', version='09.07',
+    ...     parent_series=warty, owner=yo_driver)
+    >>> print yo_series.name
+    island
+    >>> print yo_series.driver.name
+    yo-driver
+
+Owners of derivative distributions, and admins can create series too, but
+they are not automatically set as the series driver because they always
+have permission to edit the series.
+
+    >>> login_person(youbuntu.owner)
+    >>> yo_series = youbuntu.newSeries(
+    ...     name='forest', displayname='Forest', title='YouBuntu Forest',
+    ...     summary='summary', description='description', version='09.07',
+    ...     parent_series=warty, owner=youbuntu.owner)
+    >>> print yo_series.name
+    forest
+    >>> print yo_series.driver
+    None
+
+Ubuntu is an `IBaseDistribution` which requires special preparation for
+Soyuz and Translations before a series can be created. Ubuntu driver can
+not create series.
+
+    >>> login_person(ubuntu.owner.activemembers[0])
+    >>> ubuntu.driver = yo_driver
+    >>> login_person(yo_driver)
+    >>> ubuntu.newSeries(
+    ...     name='finch', displayname='Finch', title='Ubuntu Finch',
+    ...     summary='summary', description='description', version='9.06',
+    ...     parent_series=warty, owner=ubuntu.driver)
+    Traceback (most recent call last):
+     ...
+    Unauthorized: ...
+
+Owners and admins of base distributions are the only users who can create a
+series.
+
+    >>> login_person(ubuntu.owner.activemembers[0])
+    >>> u_series = ubuntu.newSeries(
+    ...     name='finch', displayname='Finch', title='Ubuntu Finch',
+    ...     summary='summary', description='description', version='9.06',
+    ...     parent_series=warty, owner=ubuntu.owner)
+    >>> print u_series.name
+    finch
+    >>> print u_series.driver
+    None
+
+
+Specification Listings
+----------------------
 
 We should be able to get lists of specifications in different states
 related to a distroseries.

=== modified file 'lib/lp/registry/doc/productseries.txt'
--- lib/lp/registry/doc/productseries.txt	2009-07-23 13:44:13 +0000
+++ lib/lp/registry/doc/productseries.txt	2009-08-10 03:39:09 +0000
@@ -75,9 +75,14 @@
     >>> login_person(firefox.owner)
     >>> emacs_series = firefox.newSeries(firefox.owner , 'emacs', summary)
 
+When a driver creates a series, he is also the driver of the new series
+to make him the release manager.
+
     >>> firefox.driver = series_driver
     >>> login_person(series_driver)
     >>> emacs2 = firefox.newSeries(series_driver , 'emacs2', summary)
+    >>> print emacs2.driver.name
+    driver
 
 A newly created series is assumed to be in the development state.
 

=== modified file 'lib/lp/registry/interfaces/distribution.py'
--- lib/lp/registry/interfaces/distribution.py	2009-08-03 13:00:37 +0000
+++ lib/lp/registry/interfaces/distribution.py	2009-08-09 18:01:59 +0000
@@ -8,7 +8,10 @@
 __metaclass__ = type
 
 __all__ = [
+    'IBaseDistribution',
+    'IDerivativeDistribution',
     'IDistribution',
+    'IDistributionDriverRestricted',
     'IDistributionEditRestricted',
     'IDistributionMirrorMenuMarker',
     'IDistributionPublic',
@@ -70,6 +73,10 @@
 class IDistributionEditRestricted(IOfficialBugTagTargetRestricted):
     """IDistribution properties requiring launchpad.Edit permission."""
 
+
+class IDistributionDriverRestricted(Interface):
+    """IDistribution properties requiring launchpad.Driver permission."""
+
     def newSeries(name, displayname, title, summary, description,
                   version, parent_series, owner):
         """Creates a new distroseries."""
@@ -533,6 +540,14 @@
 IDistribution._v_attrs['official_bug_tags'] = writable_obt_field
 
 
+class IBaseDistribution(IDistribution):
+    """A Distribution that is the base for other Distributions."""
+
+
+class IDerivativeDistribution(IDistribution):
+    """A Distribution that derives from another Distribution."""
+
+
 class IDistributionSet(Interface):
     """Interface for DistrosSet"""
     export_as_webservice_collection(IDistribution)

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2009-08-03 13:00:37 +0000
+++ lib/lp/registry/model/distribution.py	2009-08-09 21:14:27 +0000
@@ -7,7 +7,7 @@
 __metaclass__ = type
 __all__ = ['Distribution', 'DistributionSet']
 
-from zope.interface import implements
+from zope.interface import alsoProvides, implements
 from zope.component import getUtility
 
 from sqlobject import (
@@ -82,7 +82,8 @@
 from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.registry.interfaces.distribution import (
-    IDistribution, IDistributionSet)
+    IBaseDistribution, IDerivativeDistribution, IDistribution,
+    IDistributionSet)
 from lp.registry.interfaces.distributionmirror import (
     IDistributionMirror, MirrorContent, MirrorStatus)
 from lp.registry.interfaces.distroseries import (
@@ -183,6 +184,18 @@
         default=False)
     active = True # Required by IPillar interface.
 
+
+    def _init(self, *args, **kw):
+        """Initialize an `IBaseDistribution` or `IDerivativeDistribution`."""
+        SQLBase._init(self, *args, **kw)
+        # Add a marker interface to set permissions for this kind
+        # of distribution.
+        if self == getUtility(ILaunchpadCelebrities).ubuntu:
+            alsoProvides(self, IBaseDistribution)
+        else:
+            alsoProvides(self, IDerivativeDistribution)
+
+
     @property
     def uploaders(self):
         """See `IDistribution`."""
@@ -291,7 +304,7 @@
     @property
     def full_functionality(self):
         """See `IDistribution`."""
-        if self == getUtility(ILaunchpadCelebrities).ubuntu:
+        if IBaseDistribution.providedBy(self):
             return True
         return False
 
@@ -1488,7 +1501,7 @@
     def newSeries(self, name, displayname, title, summary,
                   description, version, parent_series, owner):
         """See `IDistribution`."""
-        return DistroSeries(
+        series = DistroSeries(
             distribution=self,
             name=name,
             displayname=displayname,
@@ -1499,6 +1512,10 @@
             status=DistroSeriesStatus.EXPERIMENTAL,
             parent_series=parent_series,
             owner=owner)
+        if owner.inTeam(self.driver) and not owner.inTeam(self.owner):
+            # This driver is a release manager.
+            series.driver = owner
+        return series
 
     @property
     def has_published_binaries(self):

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2009-07-19 04:41:14 +0000
+++ lib/lp/registry/model/product.py	2009-08-10 04:11:02 +0000
@@ -897,8 +897,14 @@
         # XXX: jamesh 2008-04-11
         # Set the ID of the new ProductSeries to avoid flush order
         # loops in ProductSet.createProduct()
-        return ProductSeries(productID=self.id, owner=owner, name=name,
+        series = ProductSeries(productID=self.id, owner=owner, name=name,
                              summary=summary, branch=branch)
+        if owner.inTeam(self.driver) and not owner.inTeam(self.owner):
+            # The user is a product driver, and should be the driver of this
+            # series to make him the release manager.
+            series.driver = owner
+        return series
+
 
     def getRelease(self, version):
         """See `IProduct`."""

=== renamed file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-edit.txt' => 'lib/lp/registry/stories/distroseries/xx-distroseries-edit.txt'