Merge lp:~rvb/launchpad/db-distroseries-migrate-owner-to-registrant into lp:launchpad/db-devel

Proposed by Raphaël Badin
Status: Merged
Approved by: Raphaël Badin
Approved revision: no longer in the source branch.
Merged at revision: 10320
Proposed branch: lp:~rvb/launchpad/db-distroseries-migrate-owner-to-registrant
Merge into: lp:launchpad/db-devel
Diff against target: 764 lines (+165/-188)
24 files modified
database/sampledata/current-dev.sql (+14/-14)
database/sampledata/current.sql (+14/-14)
database/schema/comments.sql (+1/-1)
database/schema/patch-2208-56-0.sql (+32/-0)
lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt (+1/-1)
lib/canonical/launchpad/security.py (+9/-9)
lib/lp/registry/browser/configure.zcml (+0/-7)
lib/lp/registry/browser/distroseries.py (+4/-9)
lib/lp/registry/configure.zcml (+1/-1)
lib/lp/registry/doc/distroseries.txt (+8/-4)
lib/lp/registry/interfaces/distribution.py (+1/-1)
lib/lp/registry/interfaces/distroseries.py (+7/-2)
lib/lp/registry/model/distribution.py (+5/-4)
lib/lp/registry/model/distroseries.py (+8/-3)
lib/lp/registry/stories/distroseries/xx-distroseries-index.txt (+3/-1)
lib/lp/registry/stories/distroseries/xx-reassign-distroseries.txt (+0/-72)
lib/lp/registry/stories/webservice/xx-distroseries.txt (+2/-1)
lib/lp/registry/templates/distroseries-index.pt (+2/-5)
lib/lp/registry/tests/test_distribution.py (+1/-1)
lib/lp/registry/tests/test_distroseries.py (+9/-0)
lib/lp/soyuz/doc/distroseriesqueue-translations.txt (+30/-30)
lib/lp/testing/factory.py (+5/-2)
lib/lp/translations/browser/tests/test_sharing_information.py (+6/-4)
utilities/soyuz-sampledata-setup.py (+2/-2)
To merge this branch: bzr merge lp:~rvb/launchpad/db-distroseries-migrate-owner-to-registrant
Reviewer Review Type Date Requested Status
Stuart Bishop (community) db Approve
Curtis Hovey (community) code Approve
Julian Edwards (community) Approve
Robert Collins db Pending
Review via email: mp+53770@code.launchpad.net

Commit message

[r=julian-edwards,sinzui,stub] [r=julian-edwards,sinzui][bug=727632] Add a 'registrant' field to distro series. Use the owner of the distribution as the distribution's owner.

Description of the change

This branch normalise the usage of the fields 'registrant' and 'owner' for distroseries.

The 'registrant' is a read only field (the person who registered the distroseries with basically no power).

The 'owner' is the real person managing the object. The attribute mirrors the owner of the
distribution (the delegated manager will be the 'driver').

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

A couple of minor things to mention:

1. The db patch can just rename the column instead of deleting/adding.
2. The chunk of added zcml in 'lib/lp/registry/configure.zcml is weirdly formatted in the diff here.

Nothing else leaps out at me, so unless Curtis sees a problem I'm ok with it.

review: Approve
Revision history for this message
Raphaël Badin (rvb) wrote :

1. Fixed the db patch (is there a way to rename a constraint?).
2. Fixed formatting.

Revision history for this message
Curtis Hovey (sinzui) wrote :

This looks good to land. We can certainly reuse this approach to fix productseries this year.

review: Approve (code)
Revision history for this message
Stuart Bishop (stub) wrote :

patch-2208-53-0.sql has already been landed, adding a new registrant column but not dropping the old owner column.

If we don't want the owner column, we need a patch that drops the owner column. We can't back out db-patches once they land without screwing up the staging server.

review: Needs Fixing (db)
Revision history for this message
Stuart Bishop (stub) wrote :

Note to self - don't review when sick.

The patch is actually fine - the patch I thought was conflicting was on Distribution, not DistroSeries.

Please rename the existing index too:

ALTER INDEX distroseries__owner__idx RENAME TO distroseries__registrant__idx;

And while you are there, we can tidy up some old misnamed indexes too:

ALTER INDEX distrorelease_pkey RENAME TO distroseries_pkey;
ALTER INDEX distrorelease_distribution_key RENAME TO distrorelease__distribution__name__key;
ALTER INDEX distrorelease_distro_release_unique RENAME TO distroseries__distribution__id__key;

patch-2208-56-0.sql

review: Approve (db)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'database/sampledata/current-dev.sql'
2--- database/sampledata/current-dev.sql 2011-03-15 15:51:58 +0000
3+++ database/sampledata/current-dev.sql 2011-03-18 11:21:43 +0000
4@@ -1885,20 +1885,20 @@
5
6 ALTER TABLE distroseries DISABLE TRIGGER ALL;
7
8-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (1, 1, 'warty', 'The Warty Warthog Release', 'Warty was the first stable release of Ubuntu. Key feature goals included releasing on time, with the latest version of the Gnome Desktop Environment, and the creation of all the infrastructure required to manage Ubuntu itself. Warty includes excellent support for Python, with most of the widely used Python libraries installed by default.', '4.10', 4, '2004-08-20 00:00:00', NULL, 17, 'Warty is the first release of Ubuntu, with a planned release date of October 2004.', 'Warty', NULL, 0, 1, 'warty-changes@ubuntu.com', 4, 3, NULL, '2006-10-16 18:31:43.475428', false, false, NULL, NULL, NULL, false);
9-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (2, 2, 'six', 'Six Six Six', 'some text to describe the whole 666 release of RH', '6.0.1', 4, '2004-03-21 00:00:00', NULL, 8, 'some text to describe the whole 666 release of RH', 'Six', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.482603', false, false, NULL, NULL, NULL, false);
10-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (3, 1, 'hoary', 'The Hoary Hedgehog Release', 'Hoary is the second release of Ubuntu. Key feature goals include the integration of Hoary with the Launchpad for bugs and translation information, as well as Gnome 2.10 and the X.org window system.', '5.04', 2, NULL, 1, 1, 'Hoary is the second released of Ubuntu, with release planned for April 2005.', 'Hoary', NULL, 96, 6, 'hoary-changes@ubuntu.com', 1, 4, NULL, '2006-10-16 18:31:43.483559', false, false, NULL, NULL, NULL, false);
11-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (4, 2, '7.0', 'Seven', 'The release that we would not expect', '7.0.1', 3, NULL, 2, 7, 'The release that we would not expect', '7.0', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.484426', false, false, NULL, NULL, NULL, false);
12-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (5, 1, 'grumpy', 'The Grumpy Groundhog Release', 'Grumpy, the third release of Ubuntu Linux, is not yet in active development. This information is purely a placeholder.', '5.10', 1, NULL, 1, 1, 'Grumpy is the third release of Ubuntu, planned for October 2005.', 'Grumpy', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.485233', false, false, NULL, NULL, NULL, false);
13-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (6, 3, 'woody', 'WOODY', 'WOODY is the current stable verison of Debian GNU/Linux', '3.0', 4, '2003-01-01 00:00:00', NULL, 2, 'WOODY is the current stable verison of Debian GNU/Linux', 'Woody', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.486054', false, false, NULL, NULL, NULL, false);
14-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (7, 3, 'sarge', 'Sarge', 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', '3.1', 3, NULL, 6, 5, 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', 'Sarge', NULL, 0, NULL, NULL, 0, 0, 6, '2006-10-16 18:31:43.486972', false, false, NULL, NULL, NULL, false);
15-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (8, 3, 'sid', 'Sid', 'Sid is the CRAZY unstable version of Debian GNU/Linux.', '3.2', 1, NULL, 6, 6, 'Sid is the CRAZY unstable version of Debian GNU/Linux.', 'Sid', NULL, 0, NULL, NULL, 0, 1, NULL, '2006-10-16 18:31:43.487779', false, false, NULL, NULL, NULL, false);
16-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (9, 7, '2k5', 'Guada 2005', 'This release places extra emphasis on usability and installability. The installer is adapted from Ubuntu to assume your country, language, keyboard and time zone preference, thus ensuring that installs ask the minimum number of questions possible.', '2005', 2, NULL, 3, 4, 'Guada 2005 is a rapid-install version of
17-Ubuntu Hoary for the Andalucian marketplace.', 'Guada2005', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.488598', false, false, NULL, NULL, NULL, false);
18-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (10, 1, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 3, 1, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, 8, 'autotest_changes@ubuntu.com', 0, 0, NULL, '2006-10-16 18:31:43.489468', false, false, NULL, NULL, NULL, false);
19-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (11, 8, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 1, 1, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.490333', false, false, NULL, NULL, NULL, false);
20-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (12, 5, 'krunch', 'The Krunchy Kangaroo', 'The archive split allows us to use different kernel settings for Kubuntu, as well as make other pervasive low-level fixes, and release on our own schedule.', '8.06', 1, NULL, 3, 1, 'This is the first experimental release of Kubuntu that uses a separate archive from the main Ubuntu release.', 'Krunch', NULL, 0, NULL, NULL, 0, 0, 33, '2006-10-16 18:31:43.491929', false, false, NULL, NULL, NULL, false);
21-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (13, 8, 'hoary-test', 'Mock Hoary', 'nothing special', '9.9.9', 1, NULL, 1, 1, 'summmmmmmary', 'Hoary Mock', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.492845', false, false, NULL, NULL, NULL, false);
22+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (1, 1, 'warty', 'The Warty Warthog Release', 'Warty was the first stable release of Ubuntu. Key feature goals included releasing on time, with the latest version of the Gnome Desktop Environment, and the creation of all the infrastructure required to manage Ubuntu itself. Warty includes excellent support for Python, with most of the widely used Python libraries installed by default.', '4.10', 4, '2004-08-20 00:00:00', NULL, 'Warty is the first release of Ubuntu, with a planned release date of October 2004.', 'Warty', NULL, 0, 1, 'warty-changes@ubuntu.com', 4, 3, NULL, '2006-10-16 18:31:43.475428', false, false, NULL, NULL, NULL, false, 17);
23+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (2, 2, 'six', 'Six Six Six', 'some text to describe the whole 666 release of RH', '6.0.1', 4, '2004-03-21 00:00:00', NULL, 'some text to describe the whole 666 release of RH', 'Six', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.482603', false, false, NULL, NULL, NULL, false, 8);
24+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (3, 1, 'hoary', 'The Hoary Hedgehog Release', 'Hoary is the second release of Ubuntu. Key feature goals include the integration of Hoary with the Launchpad for bugs and translation information, as well as Gnome 2.10 and the X.org window system.', '5.04', 2, NULL, 1, 'Hoary is the second released of Ubuntu, with release planned for April 2005.', 'Hoary', NULL, 96, 6, 'hoary-changes@ubuntu.com', 1, 4, NULL, '2006-10-16 18:31:43.483559', false, false, NULL, NULL, NULL, false, 1);
25+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (4, 2, '7.0', 'Seven', 'The release that we would not expect', '7.0.1', 3, NULL, 2, 'The release that we would not expect', '7.0', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.484426', false, false, NULL, NULL, NULL, false, 7);
26+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (5, 1, 'grumpy', 'The Grumpy Groundhog Release', 'Grumpy, the third release of Ubuntu Linux, is not yet in active development. This information is purely a placeholder.', '5.10', 1, NULL, 1, 'Grumpy is the third release of Ubuntu, planned for October 2005.', 'Grumpy', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.485233', false, false, NULL, NULL, NULL, false, 1);
27+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (6, 3, 'woody', 'WOODY', 'WOODY is the current stable verison of Debian GNU/Linux', '3.0', 4, '2003-01-01 00:00:00', NULL, 'WOODY is the current stable verison of Debian GNU/Linux', 'Woody', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.486054', false, false, NULL, NULL, NULL, false, 2);
28+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (7, 3, 'sarge', 'Sarge', 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', '3.1', 3, NULL, 6, 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', 'Sarge', NULL, 0, NULL, NULL, 0, 0, 6, '2006-10-16 18:31:43.486972', false, false, NULL, NULL, NULL, false, 5);
29+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (8, 3, 'sid', 'Sid', 'Sid is the CRAZY unstable version of Debian GNU/Linux.', '3.2', 1, NULL, 6, 'Sid is the CRAZY unstable version of Debian GNU/Linux.', 'Sid', NULL, 0, NULL, NULL, 0, 1, NULL, '2006-10-16 18:31:43.487779', false, false, NULL, NULL, NULL, false, 6);
30+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (9, 7, '2k5', 'Guada 2005', 'This release places extra emphasis on usability and installability. The installer is adapted from Ubuntu to assume your country, language, keyboard and time zone preference, thus ensuring that installs ask the minimum number of questions possible.', '2005', 2, NULL, 3, 'Guada 2005 is a rapid-install version of
31+Ubuntu Hoary for the Andalucian marketplace.', 'Guada2005', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.488598', false, false, NULL, NULL, NULL, false, 4);
32+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (10, 1, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 3, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, 8, 'autotest_changes@ubuntu.com', 0, 0, NULL, '2006-10-16 18:31:43.489468', false, false, NULL, NULL, NULL, false, 1);
33+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (11, 8, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 1, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.490333', false, false, NULL, NULL, NULL, false, 1);
34+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (12, 5, 'krunch', 'The Krunchy Kangaroo', 'The archive split allows us to use different kernel settings for Kubuntu, as well as make other pervasive low-level fixes, and release on our own schedule.', '8.06', 1, NULL, 3, 'This is the first experimental release of Kubuntu that uses a separate archive from the main Ubuntu release.', 'Krunch', NULL, 0, NULL, NULL, 0, 0, 33, '2006-10-16 18:31:43.491929', false, false, NULL, NULL, NULL, false, 1);
35+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (13, 8, 'hoary-test', 'Mock Hoary', 'nothing special', '9.9.9', 1, NULL, 1, 'summmmmmmary', 'Hoary Mock', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.492845', false, false, NULL, NULL, NULL, false, 1);
36
37
38 ALTER TABLE distroseries ENABLE TRIGGER ALL;
39
40=== modified file 'database/sampledata/current.sql'
41--- database/sampledata/current.sql 2011-03-15 15:51:58 +0000
42+++ database/sampledata/current.sql 2011-03-18 11:21:43 +0000
43@@ -1885,20 +1885,20 @@
44
45 ALTER TABLE distroseries DISABLE TRIGGER ALL;
46
47-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (1, 1, 'warty', 'The Warty Warthog Release', 'Warty was the first stable release of Ubuntu. Key feature goals included releasing on time, with the latest version of the Gnome Desktop Environment, and the creation of all the infrastructure required to manage Ubuntu itself. Warty includes excellent support for Python, with most of the widely used Python libraries installed by default.', '4.10', 4, '2004-08-20 00:00:00', NULL, 17, 'Warty is the first release of Ubuntu, with a planned release date of October 2004.', 'Warty', NULL, 0, 1, 'warty-changes@ubuntu.com', 4, 3, NULL, '2006-10-16 18:31:43.475428', false, false, NULL, NULL, NULL, false);
48-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (2, 2, 'six', 'Six Six Six', 'some text to describe the whole 666 release of RH', '6.0.1', 4, '2004-03-21 00:00:00', NULL, 8, 'some text to describe the whole 666 release of RH', 'Six', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.482603', false, false, NULL, NULL, NULL, false);
49-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (3, 1, 'hoary', 'The Hoary Hedgehog Release', 'Hoary is the second release of Ubuntu. Key feature goals include the integration of Hoary with the Launchpad for bugs and translation information, as well as Gnome 2.10 and the X.org window system.', '5.04', 2, NULL, 1, 1, 'Hoary is the second released of Ubuntu, with release planned for April 2005.', 'Hoary', NULL, 96, 6, 'hoary-changes@ubuntu.com', 1, 4, NULL, '2006-10-16 18:31:43.483559', false, false, NULL, NULL, NULL, false);
50-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (4, 2, '7.0', 'Seven', 'The release that we would not expect', '7.0.1', 3, NULL, 2, 7, 'The release that we would not expect', '7.0', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.484426', false, false, NULL, NULL, NULL, false);
51-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (5, 1, 'grumpy', 'The Grumpy Groundhog Release', 'Grumpy, the third release of Ubuntu Linux, is not yet in active development. This information is purely a placeholder.', '5.10', 1, NULL, 1, 1, 'Grumpy is the third release of Ubuntu, planned for October 2005.', 'Grumpy', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.485233', false, false, NULL, NULL, NULL, false);
52-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (6, 3, 'woody', 'WOODY', 'WOODY is the current stable verison of Debian GNU/Linux', '3.0', 4, '2003-01-01 00:00:00', NULL, 2, 'WOODY is the current stable verison of Debian GNU/Linux', 'Woody', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.486054', false, false, NULL, NULL, NULL, false);
53-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (7, 3, 'sarge', 'Sarge', 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', '3.1', 3, NULL, 6, 5, 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', 'Sarge', NULL, 0, NULL, NULL, 0, 0, 6, '2006-10-16 18:31:43.486972', false, false, NULL, NULL, NULL, false);
54-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (8, 3, 'sid', 'Sid', 'Sid is the CRAZY unstable version of Debian GNU/Linux.', '3.2', 1, NULL, 6, 6, 'Sid is the CRAZY unstable version of Debian GNU/Linux.', 'Sid', NULL, 0, NULL, NULL, 0, 1, NULL, '2006-10-16 18:31:43.487779', false, false, NULL, NULL, NULL, false);
55-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (9, 7, '2k5', 'Guada 2005', 'This release places extra emphasis on usability and installability. The installer is adapted from Ubuntu to assume your country, language, keyboard and time zone preference, thus ensuring that installs ask the minimum number of questions possible.', '2005', 2, NULL, 3, 4, 'Guada 2005 is a rapid-install version of
56-Ubuntu Hoary for the Andalucian marketplace.', 'Guada2005', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.488598', false, false, NULL, NULL, NULL, false);
57-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (10, 1, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 3, 1, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, 8, 'autotest_changes@ubuntu.com', 0, 0, NULL, '2006-10-16 18:31:43.489468', false, false, NULL, NULL, NULL, false);
58-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (11, 8, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 1, 1, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.490333', false, false, NULL, NULL, NULL, false);
59-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (12, 5, 'krunch', 'The Krunchy Kangaroo', 'The archive split allows us to use different kernel settings for Kubuntu, as well as make other pervasive low-level fixes, and release on our own schedule.', '8.06', 1, NULL, 3, 1, 'This is the first experimental release of Kubuntu that uses a separate archive from the main Ubuntu release.', 'Krunch', NULL, 0, NULL, NULL, 0, 0, 33, '2006-10-16 18:31:43.491929', false, false, NULL, NULL, NULL, false);
60-INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, owner, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested) VALUES (13, 8, 'hoary-test', 'Mock Hoary', 'nothing special', '9.9.9', 1, NULL, 1, 1, 'summmmmmmary', 'Hoary Mock', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.492845', false, false, NULL, NULL, NULL, false);
61+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (1, 1, 'warty', 'The Warty Warthog Release', 'Warty was the first stable release of Ubuntu. Key feature goals included releasing on time, with the latest version of the Gnome Desktop Environment, and the creation of all the infrastructure required to manage Ubuntu itself. Warty includes excellent support for Python, with most of the widely used Python libraries installed by default.', '4.10', 4, '2004-08-20 00:00:00', NULL, 'Warty is the first release of Ubuntu, with a planned release date of October 2004.', 'Warty', NULL, 0, 1, 'warty-changes@ubuntu.com', 4, 3, NULL, '2006-10-16 18:31:43.475428', false, false, NULL, NULL, NULL, false, 17);
62+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (2, 2, 'six', 'Six Six Six', 'some text to describe the whole 666 release of RH', '6.0.1', 4, '2004-03-21 00:00:00', NULL, 'some text to describe the whole 666 release of RH', 'Six', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.482603', false, false, NULL, NULL, NULL, false, 8);
63+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (3, 1, 'hoary', 'The Hoary Hedgehog Release', 'Hoary is the second release of Ubuntu. Key feature goals include the integration of Hoary with the Launchpad for bugs and translation information, as well as Gnome 2.10 and the X.org window system.', '5.04', 2, NULL, 1, 'Hoary is the second released of Ubuntu, with release planned for April 2005.', 'Hoary', NULL, 96, 6, 'hoary-changes@ubuntu.com', 1, 4, NULL, '2006-10-16 18:31:43.483559', false, false, NULL, NULL, NULL, false, 1);
64+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (4, 2, '7.0', 'Seven', 'The release that we would not expect', '7.0.1', 3, NULL, 2, 'The release that we would not expect', '7.0', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.484426', false, false, NULL, NULL, NULL, false, 7);
65+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (5, 1, 'grumpy', 'The Grumpy Groundhog Release', 'Grumpy, the third release of Ubuntu Linux, is not yet in active development. This information is purely a placeholder.', '5.10', 1, NULL, 1, 'Grumpy is the third release of Ubuntu, planned for October 2005.', 'Grumpy', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.485233', false, false, NULL, NULL, NULL, false, 1);
66+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (6, 3, 'woody', 'WOODY', 'WOODY is the current stable verison of Debian GNU/Linux', '3.0', 4, '2003-01-01 00:00:00', NULL, 'WOODY is the current stable verison of Debian GNU/Linux', 'Woody', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.486054', false, false, NULL, NULL, NULL, false, 2);
67+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (7, 3, 'sarge', 'Sarge', 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', '3.1', 3, NULL, 6, 'Sarge is the FROZEN unstable version of Debian GNU/Linux.', 'Sarge', NULL, 0, NULL, NULL, 0, 0, 6, '2006-10-16 18:31:43.486972', false, false, NULL, NULL, NULL, false, 5);
68+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (8, 3, 'sid', 'Sid', 'Sid is the CRAZY unstable version of Debian GNU/Linux.', '3.2', 1, NULL, 6, 'Sid is the CRAZY unstable version of Debian GNU/Linux.', 'Sid', NULL, 0, NULL, NULL, 0, 1, NULL, '2006-10-16 18:31:43.487779', false, false, NULL, NULL, NULL, false, 6);
69+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (9, 7, '2k5', 'Guada 2005', 'This release places extra emphasis on usability and installability. The installer is adapted from Ubuntu to assume your country, language, keyboard and time zone preference, thus ensuring that installs ask the minimum number of questions possible.', '2005', 2, NULL, 3, 'Guada 2005 is a rapid-install version of
70+Ubuntu Hoary for the Andalucian marketplace.', 'Guada2005', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.488598', false, false, NULL, NULL, NULL, false, 4);
71+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (10, 1, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 3, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, 8, 'autotest_changes@ubuntu.com', 0, 0, NULL, '2006-10-16 18:31:43.489468', false, false, NULL, NULL, NULL, false, 1);
72+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (11, 8, 'breezy-autotest', 'Breezy Badger Autotest', 'Autotest version of Breezy', '6.6.6', 1, NULL, 1, 'Autosync uploader test', 'Breezy Badger Autotest', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.490333', false, false, NULL, NULL, NULL, false, 1);
73+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (12, 5, 'krunch', 'The Krunchy Kangaroo', 'The archive split allows us to use different kernel settings for Kubuntu, as well as make other pervasive low-level fixes, and release on our own schedule.', '8.06', 1, NULL, 3, 'This is the first experimental release of Kubuntu that uses a separate archive from the main Ubuntu release.', 'Krunch', NULL, 0, NULL, NULL, 0, 0, 33, '2006-10-16 18:31:43.491929', false, false, NULL, NULL, NULL, false, 1);
74+INSERT INTO distroseries (id, distribution, name, title, description, version, releasestatus, datereleased, parent_series, summary, displayname, datelastlangpack, messagecount, nominatedarchindep, changeslist, binarycount, sourcecount, driver, date_created, hide_all_translations, defer_translation_imports, language_pack_base, language_pack_delta, language_pack_proposed, language_pack_full_export_requested, registrant) VALUES (13, 8, 'hoary-test', 'Mock Hoary', 'nothing special', '9.9.9', 1, NULL, 1, 'summmmmmmary', 'Hoary Mock', NULL, 0, NULL, NULL, 0, 0, NULL, '2006-10-16 18:31:43.492845', false, false, NULL, NULL, NULL, false, 1);
75
76
77 ALTER TABLE distroseries ENABLE TRIGGER ALL;
78
79=== modified file 'database/schema/comments.sql'
80--- database/schema/comments.sql 2011-03-11 17:03:37 +0000
81+++ database/schema/comments.sql 2011-03-18 11:21:43 +0000
82@@ -1621,7 +1621,7 @@
83 COMMENT ON COLUMN DistroSeries.releasestatus IS 'The current release status of this distroseries. E.g. "pre-release freeze" or "released"';
84 COMMENT ON COLUMN DistroSeries.datereleased IS 'The date on which this distroseries was released. (obviously only valid for released distributions)';
85 COMMENT ON COLUMN DistroSeries.parent_series IS 'The parent distroseries on which this distribution is based. This is related to the inheritance stuff.';
86-COMMENT ON COLUMN DistroSeries.owner IS 'The ultimate owner of this distroseries.';
87+COMMENT ON COLUMN DistroSeries.registrant IS 'The user who registered this distroseries.';
88 COMMENT ON COLUMN DistroSeries.driver IS 'This is a person or team who can act as a driver for this specific release - note that the distribution drivers can also set goals for any release.';
89 COMMENT ON COLUMN DistroSeries.changeslist IS 'The email address (name name) of the changes announcement list for this distroseries. If NULL, no announcement mail will be sent.';
90 COMMENT ON COLUMN DistroSeries.defer_translation_imports IS 'Don''t accept PO imports for this release just now.';
91
92=== added file 'database/schema/patch-2208-56-0.sql'
93--- database/schema/patch-2208-56-0.sql 1970-01-01 00:00:00 +0000
94+++ database/schema/patch-2208-56-0.sql 2011-03-18 11:21:43 +0000
95@@ -0,0 +1,32 @@
96+-- Copyright 2009 Canonical Ltd. This software is licensed under the
97+-- GNU Affero General Public License version 3 (see the file LICENSE).
98+
99+SET client_min_messages=ERROR;
100+
101+-- Renaming owner to registrant for DistroSeries
102+
103+-- Rename owner into registrant.
104+ALTER TABLE distroseries
105+ RENAME COLUMN owner TO registrant;
106+
107+-- 'Rename' constraint.
108+ALTER TABLE distroseries
109+ ADD CONSTRAINT distroseries__registrant__fk
110+ FOREIGN KEY (registrant) REFERENCES Person(id);
111+ALTER TABLE distroseries
112+ DROP CONSTRAINT distroseries__owner__fk;
113+
114+-- Rename index.
115+ALTER INDEX distroseries__owner__idx
116+ RENAME TO distroseries__registrant__idx;
117+
118+-- Rename old misnamed indexes.
119+ALTER INDEX distrorelease_pkey
120+ RENAME TO distroseries_pkey;
121+ALTER INDEX distrorelease_distribution_key
122+ RENAME TO distrorelease__distribution__name__key;
123+ALTER INDEX distrorelease_distro_release_unique
124+ RENAME TO distroseries__distribution__id__key;
125+
126+
127+INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 56, 0);
128
129=== modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt'
130--- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt 2011-03-15 08:24:29 +0000
131+++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt 2011-03-18 11:21:43 +0000
132@@ -222,7 +222,7 @@
133 >>> check("/ubuntu/hoary")
134 >>> check("/ubuntu/hoary/+edit", auth=True)
135 >>> check("/ubuntu/hoary/+specs")
136->>> check("/ubuntu/hoary/+reassign", auth=True)
137+>>> check_not_found("/ubuntu/hoary/+reassign")
138 >>> check("/ubuntu/hoary/+packaging")
139 >>> check("/ubuntu/hoary/+bugs")
140
141
142=== modified file 'lib/canonical/launchpad/security.py'
143--- lib/canonical/launchpad/security.py 2011-03-10 19:53:03 +0000
144+++ lib/canonical/launchpad/security.py 2011-03-18 11:21:43 +0000
145@@ -987,9 +987,10 @@
146 usedfor = IDistroSeries
147
148
149-class EditDistroSeriesByOwnersOrDistroOwnersOrAdmins(AuthorizationBase):
150- """The owner of the distro series should be able to modify some of the
151- fields on the IDistroSeries
152+class EditDistroSeriesByReleaseManagerOrDistroOwnersOrAdmins(
153+ AuthorizationBase):
154+ """The owner of the distro series (i.e. the owner of the distribution)
155+ should be able to modify some of the fields on the IDistroSeries
156
157 NB: there is potential for a great mess if this is not done correctly so
158 please consult with Kiko and MDZ on the mailing list before modifying
159@@ -1004,8 +1005,7 @@
160 # The series driver (release manager) may edit a series if the
161 # distribution is an `IDerivativeDistribution`
162 return True
163- return (user.inTeam(self.obj.owner) or
164- user.inTeam(self.obj.distribution.owner) or
165+ return (user.inTeam(self.obj.distribution.owner) or
166 user.in_admin)
167
168
169@@ -2054,7 +2054,7 @@
170
171 class AdminDistroSeriesLanguagePacks(
172 OnlyRosettaExpertsAndAdmins,
173- EditDistroSeriesByOwnersOrDistroOwnersOrAdmins):
174+ EditDistroSeriesByReleaseManagerOrDistroOwnersOrAdmins):
175 permission = 'launchpad.LanguagePacksAdmin'
176 usedfor = IDistroSeries
177
178@@ -2065,10 +2065,10 @@
179 edit distroseries or members of IDistribution.language_pack_admin team
180 are able to change the language packs available.
181 """
182+ EditDS = EditDistroSeriesByReleaseManagerOrDistroOwnersOrAdmins
183 return (
184 OnlyRosettaExpertsAndAdmins.checkAuthenticated(self, user) or
185- EditDistroSeriesByOwnersOrDistroOwnersOrAdmins.checkAuthenticated(
186- self, user) or
187+ EditDS.checkAuthenticated(self, user) or
188 user.inTeam(self.obj.distribution.language_pack_admin))
189
190
191@@ -2589,7 +2589,7 @@
192 if parent is None:
193 return False
194 return check_permission(self.permission, parent)
195-
196+
197
198 class SetMessageVisibility(AuthorizationBase):
199 permission = 'launchpad.Admin'
200
201=== modified file 'lib/lp/registry/browser/configure.zcml'
202--- lib/lp/registry/browser/configure.zcml 2011-03-10 17:02:15 +0000
203+++ lib/lp/registry/browser/configure.zcml 2011-03-18 11:21:43 +0000
204@@ -129,13 +129,6 @@
205 template="../templates/distroseries-needs-packaging.pt"/>
206 <browser:page
207 for="lp.registry.interfaces.distroseries.IDistroSeries"
208- permission="launchpad.Admin"
209- facet="overview"
210- class="canonical.launchpad.browser.ObjectReassignmentView"
211- name="+reassign"
212- template="../../../canonical/launchpad/templates/object-reassignment.pt"/>
213- <browser:page
214- for="lp.registry.interfaces.distroseries.IDistroSeries"
215 permission="launchpad.Edit"
216 name="+edit"
217 class="lp.registry.browser.distroseries.DistroSeriesEditView"
218
219=== modified file 'lib/lp/registry/browser/distroseries.py'
220--- lib/lp/registry/browser/distroseries.py 2011-03-08 11:56:40 +0000
221+++ lib/lp/registry/browser/distroseries.py 2011-03-18 11:21:43 +0000
222@@ -184,7 +184,7 @@
223
224 usedfor = IDistroSeries
225 facet = 'overview'
226- links = ['edit', 'reassign', 'driver', 'answers',
227+ links = ['edit', 'driver', 'answers',
228 'packaging', 'needs_packaging', 'builds', 'queue',
229 'add_port', 'create_milestone', 'subscribe', 'admin']
230
231@@ -199,11 +199,6 @@
232 summary = 'Someone with permission to set goals for this series'
233 return Link('+driver', text, summary, icon='edit')
234
235- @enabled_with_permission('launchpad.Admin')
236- def reassign(self):
237- text = 'Change registrant'
238- return Link('+reassign', text, icon='edit')
239-
240 @enabled_with_permission('launchpad.Edit')
241 def create_milestone(self):
242 text = 'Create milestone'
243@@ -496,9 +491,9 @@
244 @action(_('Create Series'), name='create')
245 def createAndAdd(self, action, data):
246 """Create and add a new Distribution Series"""
247- owner = getUtility(ILaunchBag).user
248+ registrant = getUtility(ILaunchBag).user
249
250- assert owner is not None
251+ assert registrant is not None
252 distroseries = self.context.newSeries(
253 name=data['name'],
254 displayname=data['displayname'],
255@@ -507,7 +502,7 @@
256 description=data['description'],
257 version=data['version'],
258 parent_series=data['parent_series'],
259- owner=owner)
260+ registrant=registrant)
261 notify(ObjectCreatedEvent(distroseries))
262 self.next_url = canonical_url(distroseries)
263 return distroseries
264
265=== modified file 'lib/lp/registry/configure.zcml'
266--- lib/lp/registry/configure.zcml 2011-03-18 06:51:22 +0000
267+++ lib/lp/registry/configure.zcml 2011-03-18 11:21:43 +0000
268@@ -215,7 +215,7 @@
269
270 <require
271 permission="launchpad.Moderate"
272- set_attributes="version name status owner nominatedarchindep changeslist datereleased"/>
273+ set_attributes="version name status nominatedarchindep changeslist datereleased"/>
274
275 <!-- IStructuralSubscriptionTarget -->
276
277
278=== modified file 'lib/lp/registry/doc/distroseries.txt'
279--- lib/lp/registry/doc/distroseries.txt 2010-11-02 05:48:54 +0000
280+++ lib/lp/registry/doc/distroseries.txt 2011-03-18 11:21:43 +0000
281@@ -842,9 +842,11 @@
282 >>> yo_series = youbuntu.newSeries(
283 ... name='island', displayname='Island', title='YouBuntu Island',
284 ... summary='summary', description='description', version='09.07',
285- ... parent_series=warty, owner=yo_driver)
286+ ... parent_series=warty, registrant=yo_driver)
287 >>> print yo_series.name
288 island
289+ >>> print yo_series.registrant.name
290+ yo-driver
291 >>> print yo_series.driver.name
292 yo-driver
293
294@@ -856,7 +858,7 @@
295 >>> yo_series = youbuntu.newSeries(
296 ... name='forest', displayname='Forest', title='YouBuntu Forest',
297 ... summary='summary', description='description', version='09.07',
298- ... parent_series=warty, owner=youbuntu.owner)
299+ ... parent_series=warty, registrant=youbuntu.owner)
300 >>> print yo_series.name
301 forest
302 >>> print yo_series.driver
303@@ -884,9 +886,11 @@
304 >>> u_series = ubuntu.newSeries(
305 ... name='finch', displayname='Finch', title='Ubuntu Finch',
306 ... summary='summary', description='description', version='9.06',
307- ... parent_series=warty, owner=ubuntu.owner)
308+ ... parent_series=warty, registrant=ubuntu.owner)
309 >>> print u_series.name
310 finch
311+ >>> print u_series.registrant.name
312+ ubuntu-team
313 >>> print u_series.driver
314 None
315
316@@ -1056,7 +1060,7 @@
317 mark
318 >>> print sid.driver
319 None
320- >>> print sid.owner.name
321+ >>> print sid.registrant.name
322 jdub
323
324 >>> for d in sid.drivers:
325
326=== modified file 'lib/lp/registry/interfaces/distribution.py'
327--- lib/lp/registry/interfaces/distribution.py 2011-03-09 16:35:58 +0000
328+++ lib/lp/registry/interfaces/distribution.py 2011-03-18 11:21:43 +0000
329@@ -123,7 +123,7 @@
330 """IDistribution properties requiring launchpad.Driver permission."""
331
332 def newSeries(name, displayname, title, summary, description,
333- version, parent_series, owner):
334+ version, parent_series, registrant):
335 """Creates a new distroseries."""
336
337
338
339=== modified file 'lib/lp/registry/interfaces/distroseries.py'
340--- lib/lp/registry/interfaces/distroseries.py 2011-03-10 14:05:51 +0000
341+++ lib/lp/registry/interfaces/distroseries.py 2011-03-18 11:21:43 +0000
342@@ -241,8 +241,13 @@
343 description=_("The series from which this one was branched."),
344 required=True, schema=Interface, # Really IDistroSeries, see below
345 vocabulary='DistroSeries'))
346- owner = exported(
347- PublicPersonChoice(title=_("Owner"), vocabulary='ValidOwner'))
348+ registrant = exported(
349+ PublicPersonChoice(
350+ title=_("Registrant"), vocabulary='ValidPersonOrTeam'))
351+ owner = exported(Reference(
352+ IPerson, title=_("Owning team of the derived series"), readonly=True,
353+ description=_(
354+ "This attribute mirrors the owner of the distribution.")))
355 date_created = exported(
356 Datetime(title=_("The date this series was registered.")))
357 driver = exported(
358
359=== modified file 'lib/lp/registry/model/distribution.py'
360--- lib/lp/registry/model/distribution.py 2011-03-09 13:40:58 +0000
361+++ lib/lp/registry/model/distribution.py 2011-03-18 11:21:43 +0000
362@@ -1779,7 +1779,7 @@
363 return user.inTeam(self.owner) or user.inTeam(admins)
364
365 def newSeries(self, name, displayname, title, summary,
366- description, version, parent_series, owner):
367+ description, version, parent_series, registrant):
368 """See `IDistribution`."""
369 series = DistroSeries(
370 distribution=self,
371@@ -1791,10 +1791,11 @@
372 version=version,
373 status=SeriesStatus.EXPERIMENTAL,
374 parent_series=parent_series,
375- owner=owner)
376- if owner.inTeam(self.driver) and not owner.inTeam(self.owner):
377+ registrant=registrant)
378+ if (registrant.inTeam(self.driver)
379+ and not registrant.inTeam(self.owner)):
380 # This driver is a release manager.
381- series.driver = owner
382+ series.driver = registrant
383
384 # May wish to add this to the series rather than clearing the cache --
385 # RBC 20100816.
386
387=== modified file 'lib/lp/registry/model/distroseries.py'
388--- lib/lp/registry/model/distroseries.py 2011-03-12 08:52:47 +0000
389+++ lib/lp/registry/model/distroseries.py 2011-03-18 11:21:43 +0000
390@@ -227,8 +227,8 @@
391 datereleased = UtcDateTimeCol(notNull=False, default=None)
392 parent_series = ForeignKey(
393 dbName='parent_series', foreignKey='DistroSeries', notNull=False)
394- owner = ForeignKey(
395- dbName='owner', foreignKey='Person',
396+ registrant = ForeignKey(
397+ dbName='registrant', foreignKey='Person',
398 storm_validator=validate_public_person, notNull=True)
399 driver = ForeignKey(
400 dbName="driver", foreignKey="Person",
401@@ -406,6 +406,11 @@
402 return self.distribution
403
404 @property
405+ def owner(self):
406+ """See `IDistroSeries`."""
407+ return self.distribution.owner
408+
409+ @property
410 def sortkey(self):
411 """A string to be used for sorting distro seriess.
412
413@@ -1913,7 +1918,7 @@
414 child = distribution.newSeries(
415 name=name, displayname=displayname, title=title,
416 summary=summary, description=description,
417- version=version, parent_series=self, owner=user)
418+ version=version, parent_series=self, registrant=user)
419 IStore(self).add(child)
420 else:
421 if child.parent_series is not self:
422
423=== modified file 'lib/lp/registry/stories/distroseries/xx-distroseries-index.txt'
424--- lib/lp/registry/stories/distroseries/xx-distroseries-index.txt 2010-08-05 20:17:40 +0000
425+++ lib/lp/registry/stories/distroseries/xx-distroseries-index.txt 2011-03-18 11:21:43 +0000
426@@ -20,7 +20,9 @@
427
428 >>> print extract_text(
429 ... find_tag_by_id(anon_browser.contents, 'registration'))
430- registered by Ubuntu Team on 2006-10-16
431+ Registered by
432+ Ubuntu Team on
433+ 2006-10-16
434
435 >>> print extract_text(find_main_content(anon_browser.contents))
436 Warty
437
438=== removed file 'lib/lp/registry/stories/distroseries/xx-reassign-distroseries.txt'
439--- lib/lp/registry/stories/distroseries/xx-reassign-distroseries.txt 2009-11-22 15:43:16 +0000
440+++ lib/lp/registry/stories/distroseries/xx-reassign-distroseries.txt 1970-01-01 00:00:00 +0000
441@@ -1,72 +0,0 @@
442- Change the owner of the grumpy distroseries.
443-
444-
445- Logged in as Sample Person we don't have permission to do that, because he's
446- not the owner nor a member of the admins team.
447-
448- >>> print http(r"""
449- ... GET /ubuntu/grumpy/+reassign HTTP/1.1
450- ... Authorization: Basic test@canonical.com:test
451- ... """)
452- HTTP/1.1 403 Forbidden
453- Content-Length: ...
454- Content-Type: text/html;charset=utf-8
455- ...
456-
457-
458- Now we're logged in as Mark Shutleworth and reassign grumpy to Foo Bar.
459-
460- >>> print http(r"""
461- ... POST /ubuntu/grumpy/+reassign HTTP/1.1
462- ... Authorization: Basic mark@example.com:test
463- ... field.owner=name16&field.existing=existing"""
464- ... r"""&field.actions.change=Change""")
465- HTTP/1.1 303 See Other
466- ...
467- Location: http://localhost/ubuntu/grumpy
468- ...
469-
470-
471- Foo Bar is the owner here
472-
473- >>> print http(r"""
474- ... GET /ubuntu/grumpy/ HTTP/1.1
475- ... Authorization: Basic mark@example.com:test
476- ... """)
477- HTTP/1.1 200 Ok
478- Content-Length: ...
479- Content-Type: text/html;charset=utf-8
480- ...
481- ...registered by...
482- ...
483- ...Foo Bar...
484- ...
485-
486-
487- Now we reassign it to a newly create team: ubuntu2
488-
489- >>> print http(r"""
490- ... POST /ubuntu/grumpy/+reassign HTTP/1.1
491- ... Authorization: Basic mark@example.com:test
492- ... field.owner=ubuntu2&field.existing=new&field.actions.change=Change""")
493- HTTP/1.1 303 See Other
494- ...
495- Location: http://localhost/ubuntu/grumpy
496- ...
497-
498-
499- And the new team can be seen as the owner.
500-
501- >>> print http(r"""
502- ... GET /ubuntu/grumpy/ HTTP/1.1
503- ... Authorization: Basic mark@example.com:test
504- ... """)
505- HTTP/1.1 200 Ok
506- Content-Length: ...
507- Content-Type: text/html;charset=utf-8
508- ...
509- ...registered by...
510- ...
511- ...ubuntu2...
512- ...
513-
514
515=== modified file 'lib/lp/registry/stories/webservice/xx-distroseries.txt'
516--- lib/lp/registry/stories/webservice/xx-distroseries.txt 2011-01-26 19:35:17 +0000
517+++ lib/lp/registry/stories/webservice/xx-distroseries.txt 2011-03-18 11:21:43 +0000
518@@ -75,8 +75,9 @@
519 main_archive_link: u'http://.../ubuntu/+archive/primary'
520 name: u'hoary'
521 official_bug_tags: []
522- owner_link: u'http://.../~mark'
523+ owner_link: u'http://.../~ubuntu-team'
524 parent_series_link: u'http://.../ubuntu/warty'
525+ registrant_link: u'http://.../~mark'
526 resource_type_link: ...
527 self_link: u'http://.../ubuntu/hoary'
528 status: u'Active Development'
529
530=== modified file 'lib/lp/registry/templates/distroseries-index.pt'
531--- lib/lp/registry/templates/distroseries-index.pt 2010-10-10 21:54:16 +0000
532+++ lib/lp/registry/templates/distroseries-index.pt 2011-03-18 11:21:43 +0000
533@@ -19,8 +19,8 @@
534 </tal:heading>
535
536 <tal:registering metal:fill-slot="registering">
537- registered by
538- <a tal:replace="structure context/owner/fmt:link" />
539+ Registered by
540+ <a tal:replace="structure context/registrant/fmt:link" />
541 <span tal:content="context/date_created/fmt:displaydate"
542 tal:attributes="title context/date_created/fmt:datetime"
543 >on 2005-01-01</span>
544@@ -121,9 +121,6 @@
545 <li tal:condition="overview_menu/admin/enabled">
546 <a tal:replace="structure overview_menu/admin/fmt:link" />
547 </li>
548- <li tal:condition="overview_menu/reassign/enabled">
549- <a tal:replace="structure overview_menu/reassign/fmt:link" />
550- </li>
551 <li>
552 <a tal:replace="structure overview_menu/subscribe/fmt:link" />
553 </li>
554
555=== modified file 'lib/lp/registry/tests/test_distribution.py'
556--- lib/lp/registry/tests/test_distribution.py 2011-03-15 15:46:24 +0000
557+++ lib/lp/registry/tests/test_distribution.py 2011-03-18 11:21:43 +0000
558@@ -109,7 +109,7 @@
559 distribution.newSeries(
560 name='bar', displayname='Bar', title='Bar', summary='',
561 description='', version='1', parent_series=None,
562- owner=self.factory.makePerson())
563+ registrant=self.factory.makePerson())
564 self.assertNotIn("series", cache)
565
566 # New cached value.
567
568=== modified file 'lib/lp/registry/tests/test_distroseries.py'
569--- lib/lp/registry/tests/test_distroseries.py 2011-03-10 14:05:51 +0000
570+++ lib/lp/registry/tests/test_distroseries.py 2011-03-18 11:21:43 +0000
571@@ -211,6 +211,15 @@
572 self.assertContentEqual(
573 [distroseries], distroseries.parent_series.getDerivedSeries())
574
575+ def test_registrant_owner_differ(self):
576+ # The registrant is the creator whereas the owner is the distribution's
577+ # owner
578+ registrant = self.factory.makePerson()
579+ distroseries = self.factory.makeDistroRelease(registrant=registrant)
580+ self.assertEquals(distroseries.distribution.owner, distroseries.owner)
581+ self.assertEquals(registrant, distroseries.registrant)
582+ self.assertNotEqual(distroseries.registrant, distroseries.owner)
583+
584
585 class TestDistroSeriesPackaging(TestCaseWithFactory):
586
587
588=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-translations.txt'
589--- lib/lp/soyuz/doc/distroseriesqueue-translations.txt 2010-12-22 20:46:21 +0000
590+++ lib/lp/soyuz/doc/distroseriesqueue-translations.txt 2011-03-18 11:21:43 +0000
591@@ -157,16 +157,16 @@
592 ... print '%s/%s by %s: %s' % (
593 ... entry.distroseries.name, entry.sourcepackagename.name,
594 ... entry.importer.name, entry.path)
595- dapper/pmount by mark: po/es_ES.po
596- dapper/pmount by mark: po/ca.po
597- dapper/pmount by mark: po/de.po
598- dapper/pmount by mark: po/cs.po
599- dapper/pmount by mark: po/es.po
600- dapper/pmount by mark: po/fr.po
601- dapper/pmount by mark: po/hr.po
602- dapper/pmount by mark: po/nb.po
603- dapper/pmount by mark: po/pmount.pot
604- dapper/pmount by mark: po/it_IT.po
605+ dapper/pmount by ubuntu-team: po/es_ES.po
606+ dapper/pmount by ubuntu-team: po/ca.po
607+ dapper/pmount by ubuntu-team: po/de.po
608+ dapper/pmount by ubuntu-team: po/cs.po
609+ dapper/pmount by ubuntu-team: po/es.po
610+ dapper/pmount by ubuntu-team: po/fr.po
611+ dapper/pmount by ubuntu-team: po/hr.po
612+ dapper/pmount by ubuntu-team: po/nb.po
613+ dapper/pmount by ubuntu-team: po/pmount.pot
614+ dapper/pmount by ubuntu-team: po/it_IT.po
615
616 # Abort the transaction so we can check the same upload in a different
617 # pocket.
618@@ -207,16 +207,16 @@
619 ... print '%s/%s by %s: %s' % (
620 ... entry.distroseries.name, entry.sourcepackagename.name,
621 ... entry.importer.name, entry.path)
622- dapper/pmount by mark: po/es_ES.po
623- dapper/pmount by mark: po/ca.po
624- dapper/pmount by mark: po/de.po
625- dapper/pmount by mark: po/cs.po
626- dapper/pmount by mark: po/es.po
627- dapper/pmount by mark: po/fr.po
628- dapper/pmount by mark: po/hr.po
629- dapper/pmount by mark: po/nb.po
630- dapper/pmount by mark: po/pmount.pot
631- dapper/pmount by mark: po/it_IT.po
632+ dapper/pmount by ubuntu-team: po/es_ES.po
633+ dapper/pmount by ubuntu-team: po/ca.po
634+ dapper/pmount by ubuntu-team: po/de.po
635+ dapper/pmount by ubuntu-team: po/cs.po
636+ dapper/pmount by ubuntu-team: po/es.po
637+ dapper/pmount by ubuntu-team: po/fr.po
638+ dapper/pmount by ubuntu-team: po/hr.po
639+ dapper/pmount by ubuntu-team: po/nb.po
640+ dapper/pmount by ubuntu-team: po/pmount.pot
641+ dapper/pmount by ubuntu-team: po/it_IT.po
642
643 # Let's abort the transaction so we can check the same upload in a different
644 # pocket.
645@@ -240,16 +240,16 @@
646 ... print '%s/%s by %s: %s' % (
647 ... entry.distroseries.name, entry.sourcepackagename.name,
648 ... entry.importer.name, entry.path)
649- dapper/pmount by mark: po/es_ES.po
650- dapper/pmount by mark: po/ca.po
651- dapper/pmount by mark: po/de.po
652- dapper/pmount by mark: po/cs.po
653- dapper/pmount by mark: po/es.po
654- dapper/pmount by mark: po/fr.po
655- dapper/pmount by mark: po/hr.po
656- dapper/pmount by mark: po/nb.po
657- dapper/pmount by mark: po/pmount.pot
658- dapper/pmount by mark: po/it_IT.po
659+ dapper/pmount by ubuntu-team: po/es_ES.po
660+ dapper/pmount by ubuntu-team: po/ca.po
661+ dapper/pmount by ubuntu-team: po/de.po
662+ dapper/pmount by ubuntu-team: po/cs.po
663+ dapper/pmount by ubuntu-team: po/es.po
664+ dapper/pmount by ubuntu-team: po/fr.po
665+ dapper/pmount by ubuntu-team: po/hr.po
666+ dapper/pmount by ubuntu-team: po/nb.po
667+ dapper/pmount by ubuntu-team: po/pmount.pot
668+ dapper/pmount by ubuntu-team: po/it_IT.po
669
670 # Let's abort the transaction so we can check the same upload in a different
671 # component.
672
673=== modified file 'lib/lp/testing/factory.py'
674--- lib/lp/testing/factory.py 2011-03-17 14:28:30 +0000
675+++ lib/lp/testing/factory.py 2011-03-18 11:21:43 +0000
676@@ -2253,7 +2253,8 @@
677
678 def makeDistroRelease(self, distribution=None, version=None,
679 status=SeriesStatus.DEVELOPMENT,
680- parent_series=None, name=None, displayname=None):
681+ parent_series=None, name=None, displayname=None,
682+ registrant=None):
683 """Make a new distro release."""
684 if distribution is None:
685 distribution = self.makeDistribution()
686@@ -2263,6 +2264,8 @@
687 displayname = name.capitalize()
688 if version is None:
689 version = "%s.0" % self.getUniqueInteger()
690+ if registrant is None:
691+ registrant = distribution.owner
692
693 # We don't want to login() as the person used to create the product,
694 # so we remove the security proxy before creating the series.
695@@ -2273,7 +2276,7 @@
696 displayname=displayname,
697 title=self.getUniqueString(), summary=self.getUniqueString(),
698 description=self.getUniqueString(),
699- parent_series=parent_series, owner=distribution.owner)
700+ parent_series=parent_series, registrant=registrant)
701 series.status = status
702 return ProxyFactory(series)
703
704
705=== modified file 'lib/lp/translations/browser/tests/test_sharing_information.py'
706--- lib/lp/translations/browser/tests/test_sharing_information.py 2011-03-08 11:01:41 +0000
707+++ lib/lp/translations/browser/tests/test_sharing_information.py 2011-03-18 11:21:43 +0000
708@@ -1,15 +1,15 @@
709-# Copyright 2010 Canonical Ltd. This software is licensed under the
710+# Copyright 2010-2011 Canonical Ltd. This software is licensed under the
711 # GNU Affero General Public License version 3 (see the file LICENSE).
712
713 """Tests for the POTemplate recipe view classes and templates."""
714
715 __metaclass__ = type
716
717-from canonical.testing.layers import DatabaseFunctionalLayer
718 from canonical.launchpad.testing.pages import (
719 extract_text,
720 find_tag_by_id,
721 )
722+from canonical.testing.layers import DatabaseFunctionalLayer
723 from lp.app.enums import ServiceUsage
724 from lp.services.features.testing import FeatureFixture
725 from lp.testing import (
726@@ -253,7 +253,8 @@
727
728 def getAuthorizedUser(self, potemplate):
729 with celebrity_logged_in('admin'):
730- potemplate.distroseries.owner = self.factory.makePerson(
731+ distribution = potemplate.distroseries.distribution
732+ distribution.owner = self.factory.makePerson(
733 password='test')
734 return potemplate.distroseries.owner
735
736@@ -283,6 +284,7 @@
737
738 def getAuthorizedUser(self, sourcepackage):
739 with celebrity_logged_in('admin'):
740- sourcepackage.distroseries.owner = self.factory.makePerson(
741+ makePerson = self.factory.makePerson
742+ sourcepackage.distroseries.distribution.owner = makePerson(
743 password='test')
744 return sourcepackage.distroseries.owner
745
746=== modified file 'utilities/soyuz-sampledata-setup.py'
747--- utilities/soyuz-sampledata-setup.py 2011-02-27 08:21:54 +0000
748+++ utilities/soyuz-sampledata-setup.py 2011-03-18 11:21:43 +0000
749@@ -218,14 +218,14 @@
750 def create_series(parent, full_name, version, status):
751 """Set up a `DistroSeries`."""
752 distribution = parent.distribution
753- owner = parent.owner
754+ registrant = parent.owner
755 name = full_name.split()[0].lower()
756 title = "The " + full_name
757 displayname = full_name.split()[0]
758 new_series = distribution.newSeries(name=name, title=title,
759 displayname=displayname, summary='Ubuntu %s is good.' % version,
760 description='%s is awesome.' % version, version=version,
761- parent_series=parent, owner=owner)
762+ parent_series=parent, registrant=registrant)
763 new_series.status = status
764 notify(ObjectCreatedEvent(new_series))
765

Subscribers

People subscribed via source and target branches

to status/vote changes: