Merge lp:~jml/launchpad/techboard-celebrity into lp:launchpad/db-devel

[Jonathan Lange]

[Jonathan Lange (jml)]

Currently, the Launchpad codebase has hardcoded references to the 'techboard' team in its code. It has code that looks up the team and raises errors if it isn't found. All of this is wrong.

We have a well-defined way of using well-known objects: celebrities. This branch updates the code to have a celebrity called ubuntu_techboard and updates the sampledata to guarantee its existence. It then updates the security checker and the tests to work with the new celebrity.

I've also updated the sampledata documentation based on my experiences here, as well as the https://dev.launchpad.net/AddingLaunchpadCelebrities page.

This branch depends on the sampledata branch that I recently had reviewed. This will appear as changes to database/schema/Makefile. These changes can be safely ignored.

[Deryck Hodge (deryck)]

Looks good to me, Jono.

I will point out for the sake of completeness should someone else come along, that the link you mention in your initial comment on this MP is, I believe, meant to be this link:

https://dev.launchpad.net/AddingLaunchpadCelebrity

Cheers,
deryck

review: Approve (code)

=== modified file 'database/sampledata/README'
--- database/sampledata/README	2008-11-13 12:45:38 +0000
+++ database/sampledata/README	2009-08-04 11:02:12 +0000
@@ -38,7 +38,7 @@
 
             make
 
-    3.  Connect to the db, and then do any INSERT or UPDATE commands you need:
+    3a. Connect to the db, and then do any INSERT or UPDATE commands you need:
 
             psql -d launchpad_dev -f my_sample_data_mods.sql
 
@@ -48,6 +48,15 @@
 
         If there are errors, fix and start again.
 
+    3b. Alternatively, use 'make harness' to connect to the database and use
+        any APIs you need:
+
+            make harness
+
+        Or:
+
+            make harness LPCONFIG=test-playground
+
     4.  Make a fresh snapshot of the sample data to newsampledata.sql:
 
             make newsampledata

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2009-07-29 08:42:49 +0000
+++ database/sampledata/current-dev.sql	2009-08-04 10:53:35 +0000
@@ -1,5 +1,5 @@
--- Copyright 2009 Canonical Ltd.  This software is licensed under the
--- GNU Affero General Public License version 3 (see the file LICENSE).
+--- Copyright 2009 Canonical Ltd.  This software is licensed under the
+--- GNU Affero General Public License version 3 (see the file LICENSE).
 
 SET check_function_bodies = false;
 SET client_encoding = 'UTF8';
@@ -813,6 +813,7 @@
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (243623, '2008-06-27 14:49:11.149508', 8, 20, '2008-06-27 14:49:11.149508', 'Brad Crittenden', 'mTmeENb', NULL, NULL);
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (243624, '2008-11-04 12:59:26.965843', 8, 20, '2008-11-04 13:09:43.807125', 'PPA key guard', 'cF4PNk3', NULL, '771/ppa-key-guard');
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (243625, '2009-03-17 07:28:15.948042', 1, 20, '2009-03-17 07:28:15.948042', 'Ubuntu-branches-owner', '3sbtGMy', 'Activated when the preferred email was set.', '538/ubuntu-branches-owner');
+INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (243626, '2009-08-04 10:49:59.788665', 1, 20, '2009-08-04 10:49:59.788665', 'Techboard Owner', 'LQCGF4D', 'Activated when the preferred email was set.', NULL);
 
 
 ALTER TABLE account ENABLE TRIGGER ALL;
@@ -2380,6 +2381,7 @@
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (79, '[e-mail]', 16, 2, '2008-08-05 12:01:32.086327', 16);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (80, '[e-mail]', 243627, 4, '2009-03-17 07:28:15.948042', 243625);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (81, '[e-mail]', 32, 4, '2009-06-24 00:34:34.490304', NULL);
+INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (82, '[e-mail]', 243631, 4, '2009-08-04 10:49:59.788665', 243626);
 
 
 ALTER TABLE emailaddress ENABLE TRIGGER ALL;
@@ -4761,6 +4763,8 @@
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243628, 'Ubuntu branches', 243627, 'Celebrity team that controls Ubuntu source package branches.', 'ubuntu-branches', NULL, NULL, NULL, NULL, 3, NULL, '2009-03-17 07:29:13.259033', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243629, 'Ubuntu Security Team', 4, NULL, 'ubuntu-security', NULL, NULL, NULL, NULL, 2, NULL, '2009-07-14 20:23:59.698654', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243630, 'HWDB Team', 16, NULL, 'hwdb-team', NULL, NULL, NULL, NULL, 3, NULL, '2009-07-09 09:12:39.400351', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243631, 'Techboard Owner', NULL, NULL, 'techboard-owner', NULL, NULL, NULL, NULL, 1, NULL, '2009-08-04 10:49:59.775114', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 1, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, 243626);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243632, 'Ubuntu Technical Board', 243631, NULL, 'techboard', NULL, NULL, NULL, NULL, 3, NULL, '2009-08-04 10:50:07.351252', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 
 
 ALTER TABLE person ENABLE TRIGGER ALL;
@@ -9164,6 +9168,7 @@
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (101, 243617, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (102, 243622, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (103, 243623, 243630, 2, '2009-07-09 11:58:46.481813', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:46.481813');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (104, 243631, 243632, 3, '2009-08-04 10:50:10.056772', NULL, NULL, NULL, 243631, NULL, 243631, '2009-08-04 10:50:10.056772', NULL, NULL, '2009-08-04 10:50:10.056772', NULL, NULL, NULL, '2009-08-04 10:50:07.351252');
 
 
 ALTER TABLE teammembership ENABLE TRIGGER ALL;
@@ -9366,6 +9371,9 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (214, 243630, 243617);
 INSERT INTO teamparticipation (id, team, person) VALUES (215, 243630, 243622);
 INSERT INTO teamparticipation (id, team, person) VALUES (216, 243630, 243623);
+INSERT INTO teamparticipation (id, team, person) VALUES (217, 243631, 243631);
+INSERT INTO teamparticipation (id, team, person) VALUES (218, 243632, 243632);
+INSERT INTO teamparticipation (id, team, person) VALUES (219, 243632, 243631);
 
 
 ALTER TABLE teamparticipation ENABLE TRIGGER ALL;

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2009-07-28 20:39:25 +0000
+++ database/sampledata/current.sql	2009-08-04 10:53:35 +0000
@@ -1,5 +1,5 @@
--- Copyright 2009 Canonical Ltd.  This software is licensed under the
--- GNU Affero General Public License version 3 (see the file LICENSE).
+--- Copyright 2009 Canonical Ltd.  This software is licensed under the
+--- GNU Affero General Public License version 3 (see the file LICENSE).
 
 SET check_function_bodies = false;
 SET client_encoding = 'UTF8';
@@ -813,6 +813,7 @@
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (2436231, '2008-06-27 14:49:11.149508', 8, 20, '2008-06-27 14:49:11.149508', 'Brad Crittenden', 'mTmeENb', NULL, NULL);
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (2436241, '2008-11-04 12:59:26.965843', 8, 20, '2008-11-04 13:09:43.807125', 'PPA key guard', 'cF4PNk3', NULL, '771/ppa-key-guard');
 INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (2436242, '2009-03-17 07:26:14.024613', 1, 20, '2009-03-17 07:26:14.024613', 'Ubuntu-branches-owner', 'GMX7shE', 'Activated when the preferred email was set.', '359/ubuntu-branches-owner');
+INSERT INTO account (id, date_created, creation_rationale, status, date_status_set, displayname, openid_identifier, status_comment, old_openid_identifier) VALUES (2436243, '2009-08-04 10:50:39.383407', 1, 20, '2009-08-04 10:50:39.383407', 'Techboard Owner', 'kYFxQYP', 'Activated when the preferred email was set.', NULL);
 
 
 ALTER TABLE account ENABLE TRIGGER ALL;
@@ -2382,6 +2383,7 @@
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (79, '[e-mail]', 16, 2, '2008-08-05 12:01:32.086327', 161);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (80, '[e-mail]', 243625, 4, '2008-11-04 12:59:26.965843', 2436241);
 INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (81, '[e-mail]', 243627, 4, '2009-03-17 07:26:14.024613', 2436242);
+INSERT INTO emailaddress (id, email, person, status, date_created, account) VALUES (82, '[e-mail]', 243631, 4, '2009-08-04 10:50:39.383407', 2436243);
 
 
 ALTER TABLE emailaddress ENABLE TRIGGER ALL;
@@ -4756,6 +4758,8 @@
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243628, 'Ubuntu branches', 243627, 'Celebrity team that controls official source package branches.', 'ubuntu-branches', NULL, NULL, NULL, NULL, 3, NULL, '2009-03-17 07:27:39.306182', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243629, 'Ubuntu Security Team', 4, NULL, 'ubuntu-security', NULL, NULL, NULL, NULL, 2, NULL, '2009-07-14 20:23:59.698654', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243630, 'HWDB Team', 16, NULL, 'hwdb-team', NULL, NULL, NULL, NULL, 3, NULL, '2009-07-09 09:12:39.400351', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243631, 'Techboard Owner', NULL, NULL, 'techboard-owner', NULL, NULL, NULL, NULL, 1, NULL, '2009-08-04 10:50:39.370018', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 1, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, 2436243);
+INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243632, 'Ubuntu Technical Board', 243631, NULL, 'techboard', NULL, NULL, NULL, NULL, 3, NULL, '2009-08-04 10:50:39.370018', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, true, NULL);
 
 
 ALTER TABLE person ENABLE TRIGGER ALL;
@@ -9158,6 +9162,7 @@
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (102, 243617, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (103, 243622, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (104, 243623, 243630, 2, '2009-07-09 11:58:38.122886', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2009-07-09 11:58:38.122886');
+INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (105, 243631, 243632, 3, '2009-08-04 10:50:47.920683', NULL, NULL, NULL, 243631, NULL, 243631, '2009-08-04 10:50:47.920683', NULL, NULL, '2009-08-04 10:50:47.920683', NULL, NULL, NULL, '2009-08-04 10:50:39.370018');
 
 
 ALTER TABLE teammembership ENABLE TRIGGER ALL;
@@ -9365,6 +9370,9 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (217, 243630, 243617);
 INSERT INTO teamparticipation (id, team, person) VALUES (218, 243630, 243622);
 INSERT INTO teamparticipation (id, team, person) VALUES (219, 243630, 243623);
+INSERT INTO teamparticipation (id, team, person) VALUES (220, 243631, 243631);
+INSERT INTO teamparticipation (id, team, person) VALUES (221, 243632, 243632);
+INSERT INTO teamparticipation (id, team, person) VALUES (222, 243632, 243631);
 
 
 ALTER TABLE teamparticipation ENABLE TRIGGER ALL;

=== modified file 'database/schema/Makefile'
--- database/schema/Makefile	2009-07-13 03:05:37 +0000
+++ database/schema/Makefile	2009-08-04 10:13:01 +0000
@@ -42,14 +42,20 @@
 # The command we use to drop (if exists) and recreate a database.
 CREATEDB=${PYTHON} ../../utilities/pgmassacre.py -t
 
+HEADER="--- Copyright 2009 Canonical Ltd.  This software is licensed under \
+	the\n--- GNU Affero General Public License version 3 (see the file \
+	LICENSE)."
+
 # The command used (in conjunction with $(call)) to dump the contents of the
 # given database ($1) into an SQL file ($2).
 build_new_sampledata=$(PYTHON) fti.py --null -d ${1} -q; \
+	echo $(HEADER) > $(2); \
     pg_dump --schema=public --disable-triggers -a -D -O -d ${1} \
     | grep -v "\( TOC \|INSERT INTO launchpaddatabaserevision \|sessiondata\|sessionpkgdata\|SELECT pg_catalog\.setval\|^--\| fticache \|'fticache'\|ALTER TABLE secret\|INSERT INTO secret\)" \
-    | $(PYTHON) sort_sql.py > $(2); \
+    | $(PYTHON) sort_sql.py >> $(2); \
     $(PYTHON) fti.py --force -d ${1} -q
 
+
 # The latest schema dump from production. Database patches are relative
 # to this baseline. This dump should be updated every production rollout
 # to ensure that the development database remains in sync with reality
@@ -186,5 +192,5 @@
 	$(call build_new_sampledata,${TEMPLATE_WITH_TEST_SAMPLEDATA},${LINTDATA})
 	$(call build_new_sampledata,${TEMPLATE_WITH_DEV_SAMPLEDATA},${LINTDATA_DEV})
 
-.PHONY: default base all
+.PHONY: default test dev create check search_path all doc diagram newsampledata_test newsampledata_dev newsampledata lintdata
 

=== modified file 'lib/canonical/launchpad/doc/celebrities.txt'
--- lib/canonical/launchpad/doc/celebrities.txt	2009-07-15 02:58:08 +0000
+++ lib/canonical/launchpad/doc/celebrities.txt	2009-08-04 10:53:57 +0000
@@ -1,6 +1,6 @@
 = Launchpad Celebrities =
 
-https://launchpad.canonical.com/LaunchpadCelebrities
+https://dev.launchpad.net/LaunchpadCelebrities
 
 There are a number of special objects, some of which exist in the
 database, which we want to give easy access to in the code. To this end,
@@ -211,3 +211,15 @@
     >>> ubuntu_security = personset.getByName('ubuntu-security')
     >>> celebs.ubuntu_security == ubuntu_security
     True
+
+
+== Ubuntu technical board ==
+
+There's a celebrity for the Ubuntu technical board, the 'techboard' team. It's
+used for determining who is allowed to create new package sets.
+
+    >>> ubuntu_techboard = personset.getByName('techboard')
+    >>> print ubuntu_techboard.name
+    techboard
+    >>> celebs.ubuntu_techboard == ubuntu_techboard
+    True

=== modified file 'lib/canonical/launchpad/interfaces/launchpad.py'
--- lib/canonical/launchpad/interfaces/launchpad.py	2009-07-27 18:22:07 +0000
+++ lib/canonical/launchpad/interfaces/launchpad.py	2009-08-04 10:53:57 +0000
@@ -130,6 +130,7 @@
     ubuntu_bugzilla = Attribute("The Ubuntu Bugzilla.")
     ubuntu_cdimage_mirror = Attribute("The main cdimage mirror for Ubuntu.")
     ubuntu_security = Attribute("The 'ubuntu-security' team.")
+    ubuntu_techboard = Attribute("The Ubuntu technical board.")
     vcs_imports = Attribute("The 'vcs-imports' team.")
 
 

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2009-07-31 02:45:01 +0000
+++ lib/canonical/launchpad/security.py	2009-08-04 11:53:27 +0000
@@ -2181,20 +2181,9 @@
     def checkAuthenticated(self, user):
         """Users must be an admin or a member of the tech board."""
         celebrities = getUtility(ILaunchpadCelebrities)
-        if user.inTeam(celebrities.admin):
-            return True
-
-        techboard = getUtility(IPersonSet).getByName("techboard")
-        if techboard is None:
-            # We expect techboard to be present but it's not.  Log an
-            # OOPS.
-            error = AssertionError(
-                "'techboard' team is missing, has it been renamed?")
-            info = (error.__class__, error, None)
-            globalErrorUtility = getUtility(IErrorReportingUtility)
-            globalErrorUtility.raising(info)
-            return False
-        return user.inTeam(techboard)
+        return (
+            user.inTeam(celebrities.admin)
+            or user.inTeam(celebrities.ubuntu_techboard))
 
 
 class LinkOfficialSourcePackageBranches(AuthorizationBase):

=== modified file 'lib/canonical/launchpad/utilities/celebrities.py'
--- lib/canonical/launchpad/utilities/celebrities.py	2009-07-19 04:41:14 +0000
+++ lib/canonical/launchpad/utilities/celebrities.py	2009-08-04 10:53:57 +0000
@@ -137,6 +137,7 @@
     ubuntu_branches = CelebrityDescriptor(IPersonSet, 'ubuntu-branches')
     ubuntu_bugzilla = CelebrityDescriptor(IBugTrackerSet, 'ubuntu-bugzilla')
     ubuntu_security = CelebrityDescriptor(IPersonSet, 'ubuntu-security')
+    ubuntu_techboard = CelebrityDescriptor(IPersonSet, 'techboard')
     vcs_imports = CelebrityDescriptor(IPersonSet, 'vcs-imports')
 
     @property

=== modified file 'lib/lp/soyuz/doc/archivepermission.txt'
--- lib/lp/soyuz/doc/archivepermission.txt	2009-07-27 19:39:31 +0000
+++ lib/lp/soyuz/doc/archivepermission.txt	2009-08-04 11:53:27 +0000
@@ -267,6 +267,7 @@
 Set up a helper function to check access:
 
     >>> from zope.security.checker import canAccess
+    >>> from zope.security.proxy import removeSecurityProxy
     >>> restricted_methods = (
     ...     'newPackageUploader', 'newComponentUploader', 'newQueueAdmin',
     ...     'deletePackageUploader', 'deleteComponentUploader',
@@ -274,30 +275,14 @@
     >>> def checkAccess(true_or_false):
     ...     for method in restricted_methods:
     ...         assert(canAccess(permission_set, method) == true_or_false)
-
-If, for some reason, the techboard team is missing, the security adapter
-will not allow access and generates an OOPS.
-
-    >>> login("[e-mail]")
-    >>> from zope.app.error.interfaces import IErrorReportingUtility
-    >>> report = getUtility(IErrorReportingUtility).getLastOopsReport()
-    >>> checkAccess(False)
-    >>> report2 = getUtility(IErrorReportingUtility).getLastOopsReport()
-    >>> print report.id == report2.id
-    False
-    >>> print report2.value
-    'techboard' team is missing, has it been renamed?
-
-Set up the techboard team:
-
-    >>> login("[e-mail]")
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, TeamSubscriptionPolicy)
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.teammembership import (
+    ...     TeamMembershipStatus)
     >>> personset = getUtility(IPersonSet)
-    >>> owner = personset.getByName("name16")
-    >>> techboard = personset.newTeam(
-    ...     owner, "techboard", "techboard",
-    ...     subscriptionpolicy=TeamSubscriptionPolicy.OPEN)
+    >>> techboard = getUtility(ILaunchpadCelebrities).ubuntu_techboard
+    >>> techboard = removeSecurityProxy(techboard)
 
 Ordinary users have no access:
 
@@ -312,7 +297,9 @@
 Now add "[e-mail]" to the techboard team and log in as him.
 
     >>> person = personset.getByEmail("[e-mail]")
-    >>> person.join(techboard)
+    >>> techboard.addMember(
+    ...     person, reviewer=person, status=TeamMembershipStatus.APPROVED,
+    ...     force_team_add=True)
     >>> login_person(person)
 
 newPackageUploader() creates a permission for a person to upload to a

=== modified file 'lib/lp/soyuz/doc/packageset.txt'
--- lib/lp/soyuz/doc/packageset.txt	2009-07-27 19:39:31 +0000
+++ lib/lp/soyuz/doc/packageset.txt	2009-08-04 11:53:27 +0000
@@ -557,32 +557,15 @@
 (Ubuntu Technical Board) team.
 
     >>> from zope.security.checker import canAccess
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.registry.interfaces.teammembership import (
+    ...     TeamMembershipStatus)
     >>> restricted_methods = ('new',)
-
-If, for some reason, the techboard team is missing, the security adapter
-will not allow access and generates an OOPS.
-
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPersonSet, TeamSubscriptionPolicy)
-    >>> personset = getUtility(IPersonSet)
-    >>> login('[e-mail]')
-    >>> from zope.app.error.interfaces import IErrorReportingUtility
-    >>> report = getUtility(IErrorReportingUtility).getLastOopsReport()
-    >>> canAccess(ps_factory, 'new')
-    False
-    >>> report2 = getUtility(IErrorReportingUtility).getLastOopsReport()
-    >>> print report.id == report2.id
-    False
-    >>> print report2.value
-    'techboard' team is missing, has it been renamed?
-
-Set up the techboard team:
-
-    >>> login("[e-mail]")
-    >>> owner = personset.getByName("name16")
-    >>> techboard = personset.newTeam(
-    ...     owner, "techboard", "techboard",
-    ...     subscriptionpolicy=TeamSubscriptionPolicy.OPEN)
+    >>> techboard = getUtility(ILaunchpadCelebrities).ubuntu_techboard
+    >>> techboard = removeSecurityProxy(techboard)
 
 Ordinary users have no access:
 
@@ -598,7 +581,9 @@
 
 Now add "[e-mail]" to the techboard team and log in as him.
 
-    >>> person2.join(techboard)
+    >>> techboard.addMember(
+    ...     person2, reviewer=person2, status=TeamMembershipStatus.APPROVED,
+    ...     force_team_add=True)
     >>> login_person(person2)
 
 Create a new package set.
@@ -959,8 +944,8 @@
 
     >>> print_permission(
     ...     ap_set.uploadersForPackageset(ubuntu_archive, kde_ps))
+    primary  techboard:          kde ->           UPLOAD (implicit)
     primary    juergen:          kde ->           UPLOAD (implicit)
-    primary  techboard:          kde ->           UPLOAD (implicit)
 
 
 == Checking package set based upload permissions ==