Launchpad itself

Merge lp:~wgrant/launchpad/destroy-distroseries-lucilleconfig into lp:launchpad

  1. destroy-distroseries-lucilleconfig
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 11879
Proposed branch: lp:~wgrant/launchpad/destroy-distroseries-lucilleconfig
Merge into: lp:launchpad
Prerequisite: lp:~wgrant/launchpad/more-a-f-cleanup
Diff against target: 1180 lines (+437/-326)
14 files modified
database/sampledata/current-dev.sql (+168/-119)
database/sampledata/current.sql (+154/-119)
lib/lp/archivepublisher/config.py (+1/-22)
lib/lp/archivepublisher/ftparchive.py (+11/-4)
lib/lp/archivepublisher/publishing.py (+7/-8)
lib/lp/archivepublisher/tests/publisher-config.txt (+13/-43)
lib/lp/archivepublisher/tests/test_config.py (+0/-10)
lib/lp/registry/interfaces/distroseries.py (+3/-0)
lib/lp/registry/model/distroseries.py (+9/-0)
lib/lp/soyuz/doc/archive.txt (+4/-0)
lib/lp/soyuz/doc/distroarchseries.txt (+11/-0)
lib/lp/soyuz/interfaces/archive.py (+8/-0)
lib/lp/soyuz/model/archive.py (+12/-1)
lib/lp/soyuz/tests/test_archive.py (+36/-0)
To merge this branch: bzr merge lp:~wgrant/launchpad/destroy-distroseries-lucilleconfig
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
Review via email: mp+38648@code.launchpad.net

Commit message

Calculate a distroseries' architectures and components directly from the DB, not via lucilleconfig.

Description of the change

Once upon a time, during the initial implementation of Soyuz, somebody did this:

class Config(object):
    """Manage a publisher configuration from the database. (Read Only)
    This class provides a useful abstraction so that if we change
    how the database stores configuration then the publisher will not
    need to be re-coded to cope"""

This has made a lot of people very angry and been widely regarded as a bad move. But it is ingrained enough that it persists to this day.

This is the first of a few branches to remove the dreaded lucilleconfig, an ini file stored as text in the database. Here I remove its archTagsForSeries and componentsForSeries methods, replacing them with less insane model calls.

== Implementation details ==

I've added (I)DistroSeries.enabled_architectures to allow easy retrieval of the publishable architectures. Former archTagsForSeries callsites now extract archtags from there. I realise that there is some nasty duplication there, but that can't be easily removed without a refactoring that will come later in the series.

componentsForSeries is replaced by (I)Archive.getComponentsForSeries. The new method returns the 'partner' component for PARTNER archives, and uses ComponentSelection for all other archives. This necessitated a sampledata change, as one of the test series has no ComponentSelections.

These two changes render DistroSeries.lucilleconfig obsolete, but the branch is already big enough so I'll remove it later.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Looks good, thanks for working on this.

Did you have a pre-implementation call with anybody about this?

Just one minor comment - can you clarify the comment on enabled_architectures to say more than just that it contains the enabled architectures? As we had a property earlier with the same name but different contents I think that would help prevent some potential confusion.

Do you need me to land this branch?

review: Approve (code)
Revision history for this message
William Grant (wgrant) wrote :

Thanks for the review, Jelmer.

> Looks good, thanks for working on this.
>
> Did you have a pre-implementation call with anybody about this?

Julian emphatically supports the lucilleconfig elimination attempt, but I didn't discuss the approach with anyone, as it was straightforward enough.

> Just one minor comment - can you clarify the comment on enabled_architectures
> to say more than just that it contains the enabled architectures? As we had a
> property earlier with the same name but different contents I think that would
> help prevent some potential confusion.

I'd considered it. Done.

> Do you need me to land this branch?

That would be great.

Thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql 2010-10-07 22:46:08 +0000
+++ database/sampledata/current-dev.sql 2010-11-02 21:51:48 +0000
@@ -1,6 +1,6 @@
1-- Copyright 2010 Canonical Ltd. This software is licensed under the1-- Copyright 2010 Canonical Ltd. This software is licensed under the
2-- GNU Affero General Public License version 3 (see the file LICENSE).2-- GNU Affero General Public License version 3 (see the file LICENSE).
3-- Created using pg_dump (PostgreSQL) 8.4.43-- Created using pg_dump (PostgreSQL) 8.4.5
44
5SET check_function_bodies = false;5SET check_function_bodies = false;
6SET client_encoding = 'UTF8';6SET client_encoding = 'UTF8';
@@ -810,6 +810,27 @@
810810
811811
812812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
813SET SESSION AUTHORIZATION DEFAULT;834SET SESSION AUTHORIZATION DEFAULT;
814835
815ALTER TABLE account DISABLE TRIGGER ALL;836ALTER TABLE account DISABLE TRIGGER ALL;
@@ -3333,42 +3354,42 @@
33333354
3334ALTER TABLE bugmessage DISABLE TRIGGER ALL;3355ALTER TABLE bugmessage DISABLE TRIGGER ALL;
33353356
3336INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (1, 2, 1, NULL, NULL, true);3357INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (1, 2, 1, NULL, NULL, true, NULL);
3337INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (2, 1, 3, NULL, NULL, true);3358INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (2, 1, 3, NULL, NULL, true, NULL);
3338INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (3, 1, 4, NULL, NULL, true);3359INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (3, 1, 4, NULL, NULL, true, NULL);
3339INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (4, 2, 5, NULL, NULL, true);3360INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (4, 2, 5, NULL, NULL, true, NULL);
3340INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (5, 2, 6, NULL, NULL, true);3361INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (5, 2, 6, NULL, NULL, true, NULL);
3341INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (6, 4, 7, NULL, NULL, true);3362INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (6, 4, 7, NULL, NULL, true, NULL);
3342INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (7, 5, 8, NULL, NULL, true);3363INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (7, 5, 8, NULL, NULL, true, NULL);
3343INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (8, 6, 9, NULL, NULL, true);3364INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (8, 6, 9, NULL, NULL, true, NULL);
3344INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (9, 3, 10, NULL, NULL, true);3365INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (9, 3, 10, NULL, NULL, true, NULL);
3345INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (10, 7, 11, NULL, NULL, true);3366INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (10, 7, 11, NULL, NULL, true, NULL);
3346INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (11, 8, 14, NULL, NULL, true);3367INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (11, 8, 14, NULL, NULL, true, NULL);
3347INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (12, 9, 15, NULL, NULL, true);3368INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (12, 9, 15, NULL, NULL, true, NULL);
3348INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (13, 10, 17, NULL, NULL, true);3369INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (13, 10, 17, NULL, NULL, true, NULL);
3349INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (14, 10, 16, NULL, NULL, true);3370INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (14, 10, 16, NULL, NULL, true, NULL);
3350INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (15, 11, 24, NULL, NULL, true);3371INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (15, 11, 24, NULL, NULL, true, NULL);
3351INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (16, 11, 25, NULL, NULL, true);3372INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (16, 11, 25, NULL, NULL, true, NULL);
3352INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (17, 11, 26, NULL, NULL, true);3373INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (17, 11, 26, NULL, NULL, true, NULL);
3353INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (18, 11, 27, NULL, NULL, true);3374INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (18, 11, 27, NULL, NULL, true, NULL);
3354INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (19, 11, 28, NULL, NULL, true);3375INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (19, 11, 28, NULL, NULL, true, NULL);
3355INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (20, 11, 29, NULL, NULL, true);3376INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (20, 11, 29, NULL, NULL, true, NULL);
3356INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (21, 11, 30, NULL, NULL, true);3377INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (21, 11, 30, NULL, NULL, true, NULL);
3357INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (22, 12, 31, NULL, NULL, true);3378INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (22, 12, 31, NULL, NULL, true, NULL);
3358INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (23, 12, 33, NULL, NULL, true);3379INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (23, 12, 33, NULL, NULL, true, NULL);
3359INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (24, 12, 34, NULL, NULL, true);3380INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (24, 12, 34, NULL, NULL, true, NULL);
3360INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (25, 12, 35, NULL, NULL, true);3381INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (25, 12, 35, NULL, NULL, true, NULL);
3361INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (26, 12, 36, NULL, NULL, true);3382INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (26, 12, 36, NULL, NULL, true, NULL);
3362INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (27, 13, 37, NULL, NULL, true);3383INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (27, 13, 37, NULL, NULL, true, NULL);
3363INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (28, 13, 38, NULL, NULL, true);3384INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (28, 13, 38, NULL, NULL, true, NULL);
3364INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (29, 14, 39, NULL, NULL, true);3385INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (29, 14, 39, NULL, NULL, true, NULL);
3365INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (30, 15, 40, NULL, NULL, true);3386INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (30, 15, 40, NULL, NULL, true, NULL);
3366INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true);3387INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true, NULL);
3367INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true);3388INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true, NULL);
3368INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true);3389INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true, NULL);
3369INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true);3390INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true, NULL);
3370INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true);3391INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true, NULL);
3371INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true);3392INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true, NULL);
33723393
33733394
3374ALTER TABLE bugmessage ENABLE TRIGGER ALL;3395ALTER TABLE bugmessage ENABLE TRIGGER ALL;
@@ -3799,13 +3820,6 @@
3799ALTER TABLE bugtrackercomponentgroup ENABLE TRIGGER ALL;3820ALTER TABLE bugtrackercomponentgroup ENABLE TRIGGER ALL;
38003821
38013822
3802ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
3803
3804
3805
3806ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
3807
3808
3809ALTER TABLE bugtrackercomponent DISABLE TRIGGER ALL;3823ALTER TABLE bugtrackercomponent DISABLE TRIGGER ALL;
38103824
38113825
@@ -4014,6 +4028,13 @@
4014ALTER TABLE distributionbounty ENABLE TRIGGER ALL;4028ALTER TABLE distributionbounty ENABLE TRIGGER ALL;
40154029
40164030
4031ALTER TABLE distributionjob DISABLE TRIGGER ALL;
4032
4033
4034
4035ALTER TABLE distributionjob ENABLE TRIGGER ALL;
4036
4037
4017ALTER TABLE distributionmirror DISABLE TRIGGER ALL;4038ALTER TABLE distributionmirror DISABLE TRIGGER ALL;
40184039
4019INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);4040INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);
@@ -4031,6 +4052,13 @@
4031ALTER TABLE distributionmirror ENABLE TRIGGER ALL;4052ALTER TABLE distributionmirror ENABLE TRIGGER ALL;
40324053
40334054
4055ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
4056
4057
4058
4059ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
4060
4061
4034ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;4062ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;
40354063
4036INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);4064INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);
@@ -4990,6 +5018,81 @@
4990ALTER TABLE lp_account ENABLE TRIGGER ALL;5018ALTER TABLE lp_account ENABLE TRIGGER ALL;
49915019
49925020
5021ALTER TABLE lp_openididentifier DISABLE TRIGGER ALL;
5022
5023INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6KHNEe3', 2436141, '2007-12-18 16:31:34.790641');
5024INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6w7kmzC', 2436091, '2007-12-07 13:43:20.393704');
5025INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('CALDpFr', 2436171, '2008-03-06 09:55:27.289842');
5026INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('GMX7shE', 2436242, '2009-03-17 07:26:14.024613');
5027INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('MGWJnTL', 2436111, '2007-12-14 16:52:15.403833');
5028INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('R8FpwXd', 2436161, '2007-12-18 16:31:34.790641');
5029INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('WQPMHdf', 2436081, '2007-11-12 15:23:19.847132');
5030INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('andrelop_oid', 431, '2005-06-06 08:59:51.561685');
5031INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('barbier_oid', 421, '2005-06-06 08:59:51.560604');
5032INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-importer_oid', 581, '2005-12-06 09:48:58.287679');
5033INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-watch-updater_oid', 621, '2006-05-23 12:49:30.483464');
5034INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cCGE3LA', 2436101, '2007-12-14 16:52:15.403833');
5035INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cF4PNk3', 2436241, '2008-11-04 12:59:26.965843');
5036INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('callipeo_oid', 401, '2005-06-06 08:59:51.558429');
5037INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('carlos_oid', 131, '2005-06-06 08:59:51.615543');
5038INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cprov_oid', 281, '2005-06-06 08:59:51.59705');
5039INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('daf_oid', 141, '2005-06-06 08:59:51.616666');
5040INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('danner_oid', 371, '2005-06-06 08:59:51.549651');
5041INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('ddaa_oid', 231, '2005-06-06 08:59:51.620823');
5042INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('debonzi_oid', 271, '2005-06-06 08:59:51.557224');
5043INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('edgar_oid', 331, '2005-06-06 08:59:51.621892');
5044INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('former-user_oid', 701, '2006-12-13 21:19:06.369142');
5045INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jblack_oid', 81, '2005-06-06 08:59:51.601584');
5046INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jdub_oid', 61, '2005-06-06 08:59:51.600523');
5047INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jordi_oid', 561, '2005-10-07 14:17:51.593849');
5048INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jorge-gonzalez-gonzalez_oid', 411, '2005-06-06 08:59:51.559519');
5049INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('justdave_oid', 31, '2005-06-06 08:59:51.610048');
5050INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jvprat_oid', 341, '2005-06-06 08:59:51.622908');
5051INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kYFxQYP', 2436243, '2009-08-04 10:50:39.383407');
5052INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kamion_oid', 41, '2005-06-06 08:59:51.611185');
5053INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('karl_oid', 631, '2006-05-23 12:49:30.483464');
5054INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kebil_oid', 491, '2005-06-06 08:59:51.568323');
5055INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('keybuk_oid', 51, '2005-06-06 08:59:51.608802');
5056INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kiko_oid', 91, '2005-06-06 08:59:51.594941');
5057INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kinnison_oid', 261, '2005-06-06 08:59:51.618722');
5058INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kreutzm_oid', 511, '2005-06-06 08:59:51.570701');
5059INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kurem_oid', 461, '2005-06-06 08:59:51.565033');
5060INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-beta-owner_oid', 681, '2007-01-31 06:56:25.096519');
5061INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-janitor_oid', 651, '2006-10-04 16:20:51.19954');
5062INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('lifeless_oid', 21, '2005-06-06 08:59:51.598107');
5063INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('limi_oid', 101, '2005-06-06 08:59:51.619713');
5064INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('luk-claes_oid', 451, '2005-06-06 08:59:51.563952');
5065INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mTmeENb', 2436231, '2008-06-27 14:49:11.149508');
5066INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('marilize_oid', 551, '2005-06-06 08:59:51.593849');
5067INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mark_oid', 11, '2005-06-06 08:59:51.591618');
5068INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('martin-pitt_oid', 381, '2005-06-06 08:59:51.555051');
5069INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('matsubara_oid', 661, '2006-12-13 21:19:06.369142');
5070INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('morten_oid', 471, '2005-06-06 08:59:51.56614');
5071INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mpo_oid', 481, '2005-06-06 08:59:51.567224');
5072INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name12_oid', 121, '2005-06-06 08:59:51.612277');
5073INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name16_oid', 161, '2005-06-06 08:59:51.593849');
5074INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('neMCQNd', 2436061, '2007-08-09 21:25:37.832976');
5075INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-priv_oid', 521, '2005-06-06 08:59:51.593849');
5076INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-team-memberships_oid', 2436021, '2007-02-19 11:17:57.755666');
5077INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('nsv_oid', 391, '2005-06-06 08:59:51.556132');
5078INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('one-membership_oid', 2436031, '2007-02-21 10:53:59.700105');
5079INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('rPwGRk4', 2436221, '2008-05-12 17:38:38.798696');
5080INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('salgado_oid', 291, '2005-06-06 08:59:51.596025');
5081INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('sigurd-ubuntu_oid', 351, '2005-06-06 08:59:51.623962');
5082INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('skacel_oid', 361, '2005-06-06 08:59:51.5244');
5083INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('spiv_oid', 71, '2005-06-06 08:59:51.551196');
5084INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stevea_oid', 111, '2005-06-06 08:59:51.599234');
5085INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stub_oid', 221, '2005-06-06 08:59:51.59276');
5086INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('team-membership-janitor_oid', 671, '2006-10-04 16:20:51.19954');
5087INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('tsukimi_oid', 501, '2005-06-06 08:59:51.569518');
5088INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('valyag_oid', 441, '2005-06-06 08:59:51.562857');
5089INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('yEzBPbd', 2436151, '2007-12-18 16:31:34.790641');
5090INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('zRtPxw8', 243637, '2010-07-12 09:48:27.198885');
5091
5092
5093ALTER TABLE lp_openididentifier ENABLE TRIGGER ALL;
5094
5095
4993ALTER TABLE lp_person DISABLE TRIGGER ALL;5096ALTER TABLE lp_person DISABLE TRIGGER ALL;
49945097
4995INSERT INTO lp_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 (1, 'Mark Shuttleworth', NULL, NULL, 'mark', NULL, NULL, NULL, NULL, 1, NULL, '2005-06-06 08:59:51.591618', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 11);5098INSERT INTO lp_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 (1, 'Mark Shuttleworth', NULL, NULL, 'mark', NULL, NULL, NULL, NULL, 1, NULL, '2005-06-06 08:59:51.591618', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 11);
@@ -5096,81 +5199,6 @@
5096ALTER TABLE lp_person ENABLE TRIGGER ALL;5199ALTER TABLE lp_person ENABLE TRIGGER ALL;
50975200
50985201
5099ALTER TABLE lp_openididentifier DISABLE TRIGGER ALL;
5100
5101INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6KHNEe3', 2436141, '2007-12-18 16:31:34.790641');
5102INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6w7kmzC', 2436091, '2007-12-07 13:43:20.393704');
5103INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('CALDpFr', 2436171, '2008-03-06 09:55:27.289842');
5104INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('GMX7shE', 2436242, '2009-03-17 07:26:14.024613');
5105INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('MGWJnTL', 2436111, '2007-12-14 16:52:15.403833');
5106INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('R8FpwXd', 2436161, '2007-12-18 16:31:34.790641');
5107INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('WQPMHdf', 2436081, '2007-11-12 15:23:19.847132');
5108INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('andrelop_oid', 431, '2005-06-06 08:59:51.561685');
5109INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('barbier_oid', 421, '2005-06-06 08:59:51.560604');
5110INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-importer_oid', 581, '2005-12-06 09:48:58.287679');
5111INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-watch-updater_oid', 621, '2006-05-23 12:49:30.483464');
5112INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cCGE3LA', 2436101, '2007-12-14 16:52:15.403833');
5113INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cF4PNk3', 2436241, '2008-11-04 12:59:26.965843');
5114INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('callipeo_oid', 401, '2005-06-06 08:59:51.558429');
5115INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('carlos_oid', 131, '2005-06-06 08:59:51.615543');
5116INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cprov_oid', 281, '2005-06-06 08:59:51.59705');
5117INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('daf_oid', 141, '2005-06-06 08:59:51.616666');
5118INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('danner_oid', 371, '2005-06-06 08:59:51.549651');
5119INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('ddaa_oid', 231, '2005-06-06 08:59:51.620823');
5120INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('debonzi_oid', 271, '2005-06-06 08:59:51.557224');
5121INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('edgar_oid', 331, '2005-06-06 08:59:51.621892');
5122INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('former-user_oid', 701, '2006-12-13 21:19:06.369142');
5123INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jblack_oid', 81, '2005-06-06 08:59:51.601584');
5124INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jdub_oid', 61, '2005-06-06 08:59:51.600523');
5125INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jordi_oid', 561, '2005-10-07 14:17:51.593849');
5126INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jorge-gonzalez-gonzalez_oid', 411, '2005-06-06 08:59:51.559519');
5127INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('justdave_oid', 31, '2005-06-06 08:59:51.610048');
5128INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jvprat_oid', 341, '2005-06-06 08:59:51.622908');
5129INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kYFxQYP', 2436243, '2009-08-04 10:50:39.383407');
5130INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kamion_oid', 41, '2005-06-06 08:59:51.611185');
5131INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('karl_oid', 631, '2006-05-23 12:49:30.483464');
5132INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kebil_oid', 491, '2005-06-06 08:59:51.568323');
5133INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('keybuk_oid', 51, '2005-06-06 08:59:51.608802');
5134INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kiko_oid', 91, '2005-06-06 08:59:51.594941');
5135INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kinnison_oid', 261, '2005-06-06 08:59:51.618722');
5136INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kreutzm_oid', 511, '2005-06-06 08:59:51.570701');
5137INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kurem_oid', 461, '2005-06-06 08:59:51.565033');
5138INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-beta-owner_oid', 681, '2007-01-31 06:56:25.096519');
5139INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-janitor_oid', 651, '2006-10-04 16:20:51.19954');
5140INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('lifeless_oid', 21, '2005-06-06 08:59:51.598107');
5141INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('limi_oid', 101, '2005-06-06 08:59:51.619713');
5142INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('luk-claes_oid', 451, '2005-06-06 08:59:51.563952');
5143INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mTmeENb', 2436231, '2008-06-27 14:49:11.149508');
5144INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('marilize_oid', 551, '2005-06-06 08:59:51.593849');
5145INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mark_oid', 11, '2005-06-06 08:59:51.591618');
5146INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('martin-pitt_oid', 381, '2005-06-06 08:59:51.555051');
5147INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('matsubara_oid', 661, '2006-12-13 21:19:06.369142');
5148INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('morten_oid', 471, '2005-06-06 08:59:51.56614');
5149INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mpo_oid', 481, '2005-06-06 08:59:51.567224');
5150INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name12_oid', 121, '2005-06-06 08:59:51.612277');
5151INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name16_oid', 161, '2005-06-06 08:59:51.593849');
5152INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('neMCQNd', 2436061, '2007-08-09 21:25:37.832976');
5153INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-priv_oid', 521, '2005-06-06 08:59:51.593849');
5154INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-team-memberships_oid', 2436021, '2007-02-19 11:17:57.755666');
5155INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('nsv_oid', 391, '2005-06-06 08:59:51.556132');
5156INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('one-membership_oid', 2436031, '2007-02-21 10:53:59.700105');
5157INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('rPwGRk4', 2436221, '2008-05-12 17:38:38.798696');
5158INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('salgado_oid', 291, '2005-06-06 08:59:51.596025');
5159INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('sigurd-ubuntu_oid', 351, '2005-06-06 08:59:51.623962');
5160INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('skacel_oid', 361, '2005-06-06 08:59:51.5244');
5161INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('spiv_oid', 71, '2005-06-06 08:59:51.551196');
5162INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stevea_oid', 111, '2005-06-06 08:59:51.599234');
5163INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stub_oid', 221, '2005-06-06 08:59:51.59276');
5164INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('team-membership-janitor_oid', 671, '2006-10-04 16:20:51.19954');
5165INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('tsukimi_oid', 501, '2005-06-06 08:59:51.569518');
5166INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('valyag_oid', 441, '2005-06-06 08:59:51.562857');
5167INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('yEzBPbd', 2436151, '2007-12-18 16:31:34.790641');
5168INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('zRtPxw8', 243637, '2010-07-12 09:48:27.198885');
5169
5170
5171ALTER TABLE lp_openididentifier ENABLE TRIGGER ALL;
5172
5173
5174ALTER TABLE lp_personlocation DISABLE TRIGGER ALL;5202ALTER TABLE lp_personlocation DISABLE TRIGGER ALL;
51755203
5176INSERT INTO lp_personlocation (id, date_created, person, latitude, longitude, time_zone, last_modified_by, date_last_modified, visible, locked) VALUES (1, '2007-06-05 18:34:52.127945', 12, NULL, NULL, 'Australia/Perth', 12, '2007-06-05 18:34:52.127945', true, false);5204INSERT INTO lp_personlocation (id, date_created, person, latitude, longitude, time_zone, last_modified_by, date_last_modified, visible, locked) VALUES (1, '2007-06-05 18:34:52.127945', 12, NULL, NULL, 'Australia/Perth', 12, '2007-06-05 18:34:52.127945', true, false);
@@ -6299,6 +6327,13 @@
6299ALTER TABLE personnotification ENABLE TRIGGER ALL;6327ALTER TABLE personnotification ENABLE TRIGGER ALL;
63006328
63016329
6330ALTER TABLE persontransferjob DISABLE TRIGGER ALL;
6331
6332
6333
6334ALTER TABLE persontransferjob ENABLE TRIGGER ALL;
6335
6336
6302ALTER TABLE pocketchroot DISABLE TRIGGER ALL;6337ALTER TABLE pocketchroot DISABLE TRIGGER ALL;
63036338
63046339
@@ -9815,6 +9850,13 @@
9815ALTER TABLE questionbug ENABLE TRIGGER ALL;9850ALTER TABLE questionbug ENABLE TRIGGER ALL;
98169851
98179852
9853ALTER TABLE questionjob DISABLE TRIGGER ALL;
9854
9855
9856
9857ALTER TABLE questionjob ENABLE TRIGGER ALL;
9858
9859
9818ALTER TABLE questionmessage DISABLE TRIGGER ALL;9860ALTER TABLE questionmessage DISABLE TRIGGER ALL;
98199861
9820INSERT INTO questionmessage (id, question, message, action, new_status) VALUES (1, 6, 12, 35, 18);9862INSERT INTO questionmessage (id, question, message, action, new_status) VALUES (1, 6, 12, 35, 18);
@@ -11237,6 +11279,13 @@
11237ALTER TABLE translationtemplateitem ENABLE TRIGGER ALL;11279ALTER TABLE translationtemplateitem ENABLE TRIGGER ALL;
1123811280
1123911281
11282ALTER TABLE translationtemplatesbuild DISABLE TRIGGER ALL;
11283
11284
11285
11286ALTER TABLE translationtemplatesbuild ENABLE TRIGGER ALL;
11287
11288
11240ALTER TABLE translator DISABLE TRIGGER ALL;11289ALTER TABLE translator DISABLE TRIGGER ALL;
1124111290
11242INSERT INTO translator (id, translationgroup, language, translator, datecreated, style_guide_url) VALUES (1, 1, 387, 53, '2005-07-13 13:14:19.748396', NULL);11291INSERT INTO translator (id, translationgroup, language, translator, datecreated, style_guide_url) VALUES (1, 1, 387, 53, '2005-07-13 13:14:19.748396', NULL);
1124311292
=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql 2010-10-07 22:46:08 +0000
+++ database/sampledata/current.sql 2010-11-02 21:51:48 +0000
@@ -1,6 +1,6 @@
1-- Copyright 2010 Canonical Ltd. This software is licensed under the1-- Copyright 2010 Canonical Ltd. This software is licensed under the
2-- GNU Affero General Public License version 3 (see the file LICENSE).2-- GNU Affero General Public License version 3 (see the file LICENSE).
3-- Created using pg_dump (PostgreSQL) 8.4.43-- Created using pg_dump (PostgreSQL) 8.4.5
44
5SET check_function_bodies = false;5SET check_function_bodies = false;
6SET client_encoding = 'UTF8';6SET client_encoding = 'UTF8';
@@ -822,6 +822,15 @@
822822
823823
824824
825
826
827
828
829
830
831
832
833
825SET SESSION AUTHORIZATION DEFAULT;834SET SESSION AUTHORIZATION DEFAULT;
826835
827ALTER TABLE account DISABLE TRIGGER ALL;836ALTER TABLE account DISABLE TRIGGER ALL;
@@ -3345,42 +3354,42 @@
33453354
3346ALTER TABLE bugmessage DISABLE TRIGGER ALL;3355ALTER TABLE bugmessage DISABLE TRIGGER ALL;
33473356
3348INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (1, 2, 1, NULL, NULL, true);3357INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (1, 2, 1, NULL, NULL, true, NULL);
3349INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (2, 1, 3, NULL, NULL, true);3358INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (2, 1, 3, NULL, NULL, true, NULL);
3350INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (3, 1, 4, NULL, NULL, true);3359INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (3, 1, 4, NULL, NULL, true, NULL);
3351INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (4, 2, 5, NULL, NULL, true);3360INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (4, 2, 5, NULL, NULL, true, NULL);
3352INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (5, 2, 6, NULL, NULL, true);3361INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (5, 2, 6, NULL, NULL, true, NULL);
3353INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (6, 4, 7, NULL, NULL, true);3362INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (6, 4, 7, NULL, NULL, true, NULL);
3354INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (7, 5, 8, NULL, NULL, true);3363INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (7, 5, 8, NULL, NULL, true, NULL);
3355INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (8, 6, 9, NULL, NULL, true);3364INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (8, 6, 9, NULL, NULL, true, NULL);
3356INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (9, 3, 10, NULL, NULL, true);3365INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (9, 3, 10, NULL, NULL, true, NULL);
3357INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (10, 7, 11, NULL, NULL, true);3366INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (10, 7, 11, NULL, NULL, true, NULL);
3358INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (11, 8, 14, NULL, NULL, true);3367INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (11, 8, 14, NULL, NULL, true, NULL);
3359INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (12, 9, 15, NULL, NULL, true);3368INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (12, 9, 15, NULL, NULL, true, NULL);
3360INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (13, 10, 17, NULL, NULL, true);3369INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (13, 10, 17, NULL, NULL, true, NULL);
3361INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (14, 10, 16, NULL, NULL, true);3370INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (14, 10, 16, NULL, NULL, true, NULL);
3362INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (15, 11, 24, NULL, NULL, true);3371INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (15, 11, 24, NULL, NULL, true, NULL);
3363INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (16, 11, 25, NULL, NULL, true);3372INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (16, 11, 25, NULL, NULL, true, NULL);
3364INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (17, 11, 26, NULL, NULL, true);3373INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (17, 11, 26, NULL, NULL, true, NULL);
3365INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (18, 11, 27, NULL, NULL, true);3374INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (18, 11, 27, NULL, NULL, true, NULL);
3366INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (19, 11, 28, NULL, NULL, true);3375INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (19, 11, 28, NULL, NULL, true, NULL);
3367INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (20, 11, 29, NULL, NULL, true);3376INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (20, 11, 29, NULL, NULL, true, NULL);
3368INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (21, 11, 30, NULL, NULL, true);3377INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (21, 11, 30, NULL, NULL, true, NULL);
3369INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (22, 12, 31, NULL, NULL, true);3378INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (22, 12, 31, NULL, NULL, true, NULL);
3370INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (23, 12, 33, NULL, NULL, true);3379INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (23, 12, 33, NULL, NULL, true, NULL);
3371INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (24, 12, 34, NULL, NULL, true);3380INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (24, 12, 34, NULL, NULL, true, NULL);
3372INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (25, 12, 35, NULL, NULL, true);3381INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (25, 12, 35, NULL, NULL, true, NULL);
3373INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (26, 12, 36, NULL, NULL, true);3382INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (26, 12, 36, NULL, NULL, true, NULL);
3374INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (27, 13, 37, NULL, NULL, true);3383INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (27, 13, 37, NULL, NULL, true, NULL);
3375INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (28, 13, 38, NULL, NULL, true);3384INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (28, 13, 38, NULL, NULL, true, NULL);
3376INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (29, 14, 39, NULL, NULL, true);3385INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (29, 14, 39, NULL, NULL, true, NULL);
3377INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (30, 15, 40, NULL, NULL, true);3386INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (30, 15, 40, NULL, NULL, true, NULL);
3378INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true);3387INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true, NULL);
3379INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true);3388INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true, NULL);
3380INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true);3389INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true, NULL);
3381INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true);3390INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true, NULL);
3382INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true);3391INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true, NULL);
3383INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true);3392INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true, NULL);
33843393
33853394
3386ALTER TABLE bugmessage ENABLE TRIGGER ALL;3395ALTER TABLE bugmessage ENABLE TRIGGER ALL;
@@ -3811,13 +3820,6 @@
3811ALTER TABLE bugtrackercomponentgroup ENABLE TRIGGER ALL;3820ALTER TABLE bugtrackercomponentgroup ENABLE TRIGGER ALL;
38123821
38133822
3814ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
3815
3816
3817
3818ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
3819
3820
3821ALTER TABLE bugtrackercomponent DISABLE TRIGGER ALL;3823ALTER TABLE bugtrackercomponent DISABLE TRIGGER ALL;
38223824
38233825
@@ -3940,6 +3942,11 @@
3940INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (12, 1, 3, '2006-10-16 18:31:43.262049');3942INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (12, 1, 3, '2006-10-16 18:31:43.262049');
3941INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (13, 10, 5, '2007-06-24 13:12:05.04436');3943INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (13, 10, 5, '2007-06-24 13:12:05.04436');
3942INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (14, 11, 5, '2007-06-24 13:12:10.692827');3944INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (14, 11, 5, '2007-06-24 13:12:10.692827');
3945INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (15, 13, 1, '2010-10-15 00:37:06.128465');
3946INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (16, 13, 2, '2010-10-15 00:37:07.363901');
3947INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (17, 13, 3, '2010-10-15 00:37:08.219902');
3948INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (18, 13, 4, '2010-10-15 00:37:09.099819');
3949INSERT INTO componentselection (id, distroseries, component, date_created) VALUES (19, 13, 5, '2010-10-15 00:37:09.988375');
39433950
39443951
3945ALTER TABLE componentselection ENABLE TRIGGER ALL;3952ALTER TABLE componentselection ENABLE TRIGGER ALL;
@@ -4026,6 +4033,13 @@
4026ALTER TABLE distributionbounty ENABLE TRIGGER ALL;4033ALTER TABLE distributionbounty ENABLE TRIGGER ALL;
40274034
40284035
4036ALTER TABLE distributionjob DISABLE TRIGGER ALL;
4037
4038
4039
4040ALTER TABLE distributionjob ENABLE TRIGGER ALL;
4041
4042
4029ALTER TABLE distributionmirror DISABLE TRIGGER ALL;4043ALTER TABLE distributionmirror DISABLE TRIGGER ALL;
40304044
4031INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);4045INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);
@@ -4043,6 +4057,13 @@
4043ALTER TABLE distributionmirror ENABLE TRIGGER ALL;4057ALTER TABLE distributionmirror ENABLE TRIGGER ALL;
40444058
40454059
4060ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
4061
4062
4063
4064ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
4065
4066
4046ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;4067ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;
40474068
4048INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);4069INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);
@@ -5002,6 +5023,81 @@
5002ALTER TABLE lp_account ENABLE TRIGGER ALL;5023ALTER TABLE lp_account ENABLE TRIGGER ALL;
50035024
50045025
5026ALTER TABLE lp_openididentifier DISABLE TRIGGER ALL;
5027
5028INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6KHNEe3', 2436141, '2007-12-18 16:31:34.790641');
5029INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6w7kmzC', 2436091, '2007-12-07 13:43:20.393704');
5030INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('CALDpFr', 2436171, '2008-03-06 09:55:27.289842');
5031INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('GMX7shE', 2436242, '2009-03-17 07:26:14.024613');
5032INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('MGWJnTL', 2436111, '2007-12-14 16:52:15.403833');
5033INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('R8FpwXd', 2436161, '2007-12-18 16:31:34.790641');
5034INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('WQPMHdf', 2436081, '2007-11-12 15:23:19.847132');
5035INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('andrelop_oid', 431, '2005-06-06 08:59:51.561685');
5036INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('barbier_oid', 421, '2005-06-06 08:59:51.560604');
5037INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-importer_oid', 581, '2005-12-06 09:48:58.287679');
5038INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-watch-updater_oid', 621, '2006-05-23 12:49:30.483464');
5039INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cCGE3LA', 2436101, '2007-12-14 16:52:15.403833');
5040INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cF4PNk3', 2436241, '2008-11-04 12:59:26.965843');
5041INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('callipeo_oid', 401, '2005-06-06 08:59:51.558429');
5042INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('carlos_oid', 131, '2005-06-06 08:59:51.615543');
5043INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cprov_oid', 281, '2005-06-06 08:59:51.59705');
5044INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('daf_oid', 141, '2005-06-06 08:59:51.616666');
5045INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('danner_oid', 371, '2005-06-06 08:59:51.549651');
5046INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('ddaa_oid', 231, '2005-06-06 08:59:51.620823');
5047INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('debonzi_oid', 271, '2005-06-06 08:59:51.557224');
5048INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('edgar_oid', 331, '2005-06-06 08:59:51.621892');
5049INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('former-user_oid', 701, '2006-12-13 21:19:06.369142');
5050INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jblack_oid', 81, '2005-06-06 08:59:51.601584');
5051INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jdub_oid', 61, '2005-06-06 08:59:51.600523');
5052INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jordi_oid', 561, '2005-10-07 14:17:51.593849');
5053INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jorge-gonzalez-gonzalez_oid', 411, '2005-06-06 08:59:51.559519');
5054INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('justdave_oid', 31, '2005-06-06 08:59:51.610048');
5055INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jvprat_oid', 341, '2005-06-06 08:59:51.622908');
5056INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kYFxQYP', 2436243, '2009-08-04 10:50:39.383407');
5057INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kamion_oid', 41, '2005-06-06 08:59:51.611185');
5058INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('karl_oid', 631, '2006-05-23 12:49:30.483464');
5059INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kebil_oid', 491, '2005-06-06 08:59:51.568323');
5060INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('keybuk_oid', 51, '2005-06-06 08:59:51.608802');
5061INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kiko_oid', 91, '2005-06-06 08:59:51.594941');
5062INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kinnison_oid', 261, '2005-06-06 08:59:51.618722');
5063INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kreutzm_oid', 511, '2005-06-06 08:59:51.570701');
5064INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kurem_oid', 461, '2005-06-06 08:59:51.565033');
5065INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-beta-owner_oid', 681, '2007-01-31 06:56:25.096519');
5066INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-janitor_oid', 651, '2006-10-04 16:20:51.19954');
5067INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('lifeless_oid', 21, '2005-06-06 08:59:51.598107');
5068INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('limi_oid', 101, '2005-06-06 08:59:51.619713');
5069INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('luk-claes_oid', 451, '2005-06-06 08:59:51.563952');
5070INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mTmeENb', 2436231, '2008-06-27 14:49:11.149508');
5071INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('marilize_oid', 551, '2005-06-06 08:59:51.593849');
5072INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mark_oid', 11, '2005-06-06 08:59:51.591618');
5073INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('martin-pitt_oid', 381, '2005-06-06 08:59:51.555051');
5074INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('matsubara_oid', 661, '2006-12-13 21:19:06.369142');
5075INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('morten_oid', 471, '2005-06-06 08:59:51.56614');
5076INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mpo_oid', 481, '2005-06-06 08:59:51.567224');
5077INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name12_oid', 121, '2005-06-06 08:59:51.612277');
5078INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name16_oid', 161, '2005-06-06 08:59:51.593849');
5079INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('neMCQNd', 2436061, '2007-08-09 21:25:37.832976');
5080INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-priv_oid', 521, '2005-06-06 08:59:51.593849');
5081INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-team-memberships_oid', 2436021, '2007-02-19 11:17:57.755666');
5082INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('nsv_oid', 391, '2005-06-06 08:59:51.556132');
5083INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('one-membership_oid', 2436031, '2007-02-21 10:53:59.700105');
5084INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('rPwGRk4', 2436221, '2008-05-12 17:38:38.798696');
5085INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('salgado_oid', 291, '2005-06-06 08:59:51.596025');
5086INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('sigurd-ubuntu_oid', 351, '2005-06-06 08:59:51.623962');
5087INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('skacel_oid', 361, '2005-06-06 08:59:51.5244');
5088INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('spiv_oid', 71, '2005-06-06 08:59:51.551196');
5089INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stevea_oid', 111, '2005-06-06 08:59:51.599234');
5090INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stub_oid', 221, '2005-06-06 08:59:51.59276');
5091INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('team-membership-janitor_oid', 671, '2006-10-04 16:20:51.19954');
5092INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('tsukimi_oid', 501, '2005-06-06 08:59:51.569518');
5093INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('valyag_oid', 441, '2005-06-06 08:59:51.562857');
5094INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('yEzBPbd', 2436151, '2007-12-18 16:31:34.790641');
5095INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('zRtPxw8', 243637, '2010-07-12 09:48:27.198885');
5096
5097
5098ALTER TABLE lp_openididentifier ENABLE TRIGGER ALL;
5099
5100
5005ALTER TABLE lp_person DISABLE TRIGGER ALL;5101ALTER TABLE lp_person DISABLE TRIGGER ALL;
50065102
5007INSERT INTO lp_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 (1, 'Mark Shuttleworth', NULL, NULL, 'mark', NULL, NULL, NULL, NULL, 1, NULL, '2005-06-06 08:59:51.591618', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 11);5103INSERT INTO lp_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 (1, 'Mark Shuttleworth', NULL, NULL, 'mark', NULL, NULL, NULL, NULL, 1, NULL, '2005-06-06 08:59:51.591618', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 11);
@@ -5108,81 +5204,6 @@
5108ALTER TABLE lp_person ENABLE TRIGGER ALL;5204ALTER TABLE lp_person ENABLE TRIGGER ALL;
51095205
51105206
5111ALTER TABLE lp_openididentifier DISABLE TRIGGER ALL;
5112
5113INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6KHNEe3', 2436141, '2007-12-18 16:31:34.790641');
5114INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('6w7kmzC', 2436091, '2007-12-07 13:43:20.393704');
5115INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('CALDpFr', 2436171, '2008-03-06 09:55:27.289842');
5116INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('GMX7shE', 2436242, '2009-03-17 07:26:14.024613');
5117INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('MGWJnTL', 2436111, '2007-12-14 16:52:15.403833');
5118INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('R8FpwXd', 2436161, '2007-12-18 16:31:34.790641');
5119INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('WQPMHdf', 2436081, '2007-11-12 15:23:19.847132');
5120INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('andrelop_oid', 431, '2005-06-06 08:59:51.561685');
5121INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('barbier_oid', 421, '2005-06-06 08:59:51.560604');
5122INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-importer_oid', 581, '2005-12-06 09:48:58.287679');
5123INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('bug-watch-updater_oid', 621, '2006-05-23 12:49:30.483464');
5124INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cCGE3LA', 2436101, '2007-12-14 16:52:15.403833');
5125INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cF4PNk3', 2436241, '2008-11-04 12:59:26.965843');
5126INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('callipeo_oid', 401, '2005-06-06 08:59:51.558429');
5127INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('carlos_oid', 131, '2005-06-06 08:59:51.615543');
5128INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('cprov_oid', 281, '2005-06-06 08:59:51.59705');
5129INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('daf_oid', 141, '2005-06-06 08:59:51.616666');
5130INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('danner_oid', 371, '2005-06-06 08:59:51.549651');
5131INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('ddaa_oid', 231, '2005-06-06 08:59:51.620823');
5132INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('debonzi_oid', 271, '2005-06-06 08:59:51.557224');
5133INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('edgar_oid', 331, '2005-06-06 08:59:51.621892');
5134INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('former-user_oid', 701, '2006-12-13 21:19:06.369142');
5135INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jblack_oid', 81, '2005-06-06 08:59:51.601584');
5136INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jdub_oid', 61, '2005-06-06 08:59:51.600523');
5137INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jordi_oid', 561, '2005-10-07 14:17:51.593849');
5138INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jorge-gonzalez-gonzalez_oid', 411, '2005-06-06 08:59:51.559519');
5139INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('justdave_oid', 31, '2005-06-06 08:59:51.610048');
5140INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('jvprat_oid', 341, '2005-06-06 08:59:51.622908');
5141INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kYFxQYP', 2436243, '2009-08-04 10:50:39.383407');
5142INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kamion_oid', 41, '2005-06-06 08:59:51.611185');
5143INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('karl_oid', 631, '2006-05-23 12:49:30.483464');
5144INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kebil_oid', 491, '2005-06-06 08:59:51.568323');
5145INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('keybuk_oid', 51, '2005-06-06 08:59:51.608802');
5146INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kiko_oid', 91, '2005-06-06 08:59:51.594941');
5147INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kinnison_oid', 261, '2005-06-06 08:59:51.618722');
5148INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kreutzm_oid', 511, '2005-06-06 08:59:51.570701');
5149INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('kurem_oid', 461, '2005-06-06 08:59:51.565033');
5150INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-beta-owner_oid', 681, '2007-01-31 06:56:25.096519');
5151INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('launchpad-janitor_oid', 651, '2006-10-04 16:20:51.19954');
5152INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('lifeless_oid', 21, '2005-06-06 08:59:51.598107');
5153INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('limi_oid', 101, '2005-06-06 08:59:51.619713');
5154INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('luk-claes_oid', 451, '2005-06-06 08:59:51.563952');
5155INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mTmeENb', 2436231, '2008-06-27 14:49:11.149508');
5156INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('marilize_oid', 551, '2005-06-06 08:59:51.593849');
5157INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mark_oid', 11, '2005-06-06 08:59:51.591618');
5158INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('martin-pitt_oid', 381, '2005-06-06 08:59:51.555051');
5159INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('matsubara_oid', 661, '2006-12-13 21:19:06.369142');
5160INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('morten_oid', 471, '2005-06-06 08:59:51.56614');
5161INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('mpo_oid', 481, '2005-06-06 08:59:51.567224');
5162INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name12_oid', 121, '2005-06-06 08:59:51.612277');
5163INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('name16_oid', 161, '2005-06-06 08:59:51.593849');
5164INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('neMCQNd', 2436061, '2007-08-09 21:25:37.832976');
5165INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-priv_oid', 521, '2005-06-06 08:59:51.593849');
5166INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('no-team-memberships_oid', 2436021, '2007-02-19 11:17:57.755666');
5167INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('nsv_oid', 391, '2005-06-06 08:59:51.556132');
5168INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('one-membership_oid', 2436031, '2007-02-21 10:53:59.700105');
5169INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('rPwGRk4', 2436221, '2008-05-12 17:38:38.798696');
5170INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('salgado_oid', 291, '2005-06-06 08:59:51.596025');
5171INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('sigurd-ubuntu_oid', 351, '2005-06-06 08:59:51.623962');
5172INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('skacel_oid', 361, '2005-06-06 08:59:51.5244');
5173INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('spiv_oid', 71, '2005-06-06 08:59:51.551196');
5174INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stevea_oid', 111, '2005-06-06 08:59:51.599234');
5175INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('stub_oid', 221, '2005-06-06 08:59:51.59276');
5176INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('team-membership-janitor_oid', 671, '2006-10-04 16:20:51.19954');
5177INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('tsukimi_oid', 501, '2005-06-06 08:59:51.569518');
5178INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('valyag_oid', 441, '2005-06-06 08:59:51.562857');
5179INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('yEzBPbd', 2436151, '2007-12-18 16:31:34.790641');
5180INSERT INTO lp_openididentifier (identifier, account, date_created) VALUES ('zRtPxw8', 243637, '2010-07-12 09:48:27.198885');
5181
5182
5183ALTER TABLE lp_openididentifier ENABLE TRIGGER ALL;
5184
5185
5186ALTER TABLE lp_personlocation DISABLE TRIGGER ALL;5207ALTER TABLE lp_personlocation DISABLE TRIGGER ALL;
51875208
5188INSERT INTO lp_personlocation (id, date_created, person, latitude, longitude, time_zone, last_modified_by, date_last_modified, visible, locked) VALUES (1, '2007-06-05 18:34:52.127945', 12, NULL, NULL, 'Australia/Perth', 12, '2007-06-05 18:34:52.127945', true, false);5209INSERT INTO lp_personlocation (id, date_created, person, latitude, longitude, time_zone, last_modified_by, date_last_modified, visible, locked) VALUES (1, '2007-06-05 18:34:52.127945', 12, NULL, NULL, 'Australia/Perth', 12, '2007-06-05 18:34:52.127945', true, false);
@@ -6311,6 +6332,13 @@
6311ALTER TABLE personnotification ENABLE TRIGGER ALL;6332ALTER TABLE personnotification ENABLE TRIGGER ALL;
63126333
63136334
6335ALTER TABLE persontransferjob DISABLE TRIGGER ALL;
6336
6337
6338
6339ALTER TABLE persontransferjob ENABLE TRIGGER ALL;
6340
6341
6314ALTER TABLE pocketchroot DISABLE TRIGGER ALL;6342ALTER TABLE pocketchroot DISABLE TRIGGER ALL;
63156343
63166344
@@ -9827,6 +9855,13 @@
9827ALTER TABLE questionbug ENABLE TRIGGER ALL;9855ALTER TABLE questionbug ENABLE TRIGGER ALL;
98289856
98299857
9858ALTER TABLE questionjob DISABLE TRIGGER ALL;
9859
9860
9861
9862ALTER TABLE questionjob ENABLE TRIGGER ALL;
9863
9864
9830ALTER TABLE questionmessage DISABLE TRIGGER ALL;9865ALTER TABLE questionmessage DISABLE TRIGGER ALL;
98319866
9832INSERT INTO questionmessage (id, question, message, action, new_status) VALUES (1, 6, 12, 35, 18);9867INSERT INTO questionmessage (id, question, message, action, new_status) VALUES (1, 6, 12, 35, 18);
98339868
=== modified file 'lib/lp/archivepublisher/config.py'
--- lib/lp/archivepublisher/config.py 2010-10-06 11:46:51 +0000
+++ lib/lp/archivepublisher/config.py 2010-11-02 21:51:48 +0000
@@ -51,12 +51,6 @@
51 archive.distribution.name)51 archive.distribution.name)
52 update_pub_config(pubconf)52 update_pub_config(pubconf)
53 elif archive.purpose == ArchivePurpose.PARTNER:53 elif archive.purpose == ArchivePurpose.PARTNER:
54 # Reset the list of components to partner only. This prevents
55 # any publisher runs from generating components not related to
56 # the partner archive.
57 for distroseries in pubconf._distroseries.keys():
58 pubconf._distroseries[
59 distroseries]['components'] = ['partner']
60 pubconf.distroroot = config.archivepublisher.root54 pubconf.distroroot = config.archivepublisher.root
61 pubconf.archiveroot = os.path.join(55 pubconf.archiveroot = os.path.join(
62 pubconf.distroroot, archive.distribution.name + '-partner')56 pubconf.distroroot, archive.distribution.name + '-partner')
@@ -112,22 +106,13 @@
112106
113 for dr in distribution:107 for dr in distribution:
114 distroseries_name = dr.name.encode('utf-8')108 distroseries_name = dr.name.encode('utf-8')
115 config_segment = {109 config_segment = {}
116 "archtags": []
117 }
118
119 for dar in dr.architectures:
120 if dar.enabled:
121 config_segment["archtags"].append(
122 dar.architecturetag.encode('utf-8'))
123110
124 if dr.lucilleconfig:111 if dr.lucilleconfig:
125 strio = StringIO(dr.lucilleconfig.encode('utf-8'))112 strio = StringIO(dr.lucilleconfig.encode('utf-8'))
126 config_segment["config"] = ConfigParser()113 config_segment["config"] = ConfigParser()
127 config_segment["config"].readfp(strio)114 config_segment["config"].readfp(strio)
128 strio.close()115 strio.close()
129 config_segment["components"] = config_segment["config"].get(
130 "publishing", "components").split(" ")
131116
132 self._distroseries[distroseries_name] = config_segment117 self._distroseries[distroseries_name] = config_segment
133118
@@ -150,12 +135,6 @@
150 'No Lucille config section for %s in %s' %135 'No Lucille config section for %s in %s' %
151 (dr, self.distroName))136 (dr, self.distroName))
152137
153 def archTagsForSeries(self, dr):
154 return self.series(dr)["archtags"]
155
156 def componentsForSeries(self, dr):
157 return self.series(dr)["components"]
158
159 def _extractConfigInfo(self):138 def _extractConfigInfo(self):
160 """Extract configuration information into the attributes we use"""139 """Extract configuration information into the attributes we use"""
161 self.stayofexecution = self._distroconfig.get(140 self.stayofexecution = self._distroconfig.get(
162141
=== modified file 'lib/lp/archivepublisher/ftparchive.py'
--- lib/lp/archivepublisher/ftparchive.py 2010-10-17 10:04:15 +0000
+++ lib/lp/archivepublisher/ftparchive.py 2010-11-02 21:51:48 +0000
@@ -196,7 +196,9 @@
196 anything in them currently.196 anything in them currently.
197 """197 """
198 for distroseries in self.distroseries:198 for distroseries in self.distroseries:
199 components = self._config.componentsForSeries(distroseries.name)199 components = [
200 comp.name for comp in
201 self.publisher.archive.getComponentsForSeries(distroseries)]
200 for pocket in PackagePublishingPocket.items:202 for pocket in PackagePublishingPocket.items:
201 if not fullpublish:203 if not fullpublish:
202 if not self.publisher.isDirty(distroseries, pocket):204 if not self.publisher.isDirty(distroseries, pocket):
@@ -239,7 +241,9 @@
239 "_".join((suite, ) + parts)))241 "_".join((suite, ) + parts)))
240 touch_list(comp, "source")242 touch_list(comp, "source")
241243
242 for arch in self._config.archTagsForSeries(distroseries.name):244 arch_tags = [
245 a.architecturetag for a in distroseries.enabled_architectures]
246 for arch in arch_tags:
243 # Touch more file lists for the archs.247 # Touch more file lists for the archs.
244 touch_list(comp, "binary-" + arch)248 touch_list(comp, "binary-" + arch)
245 touch_list(comp, "debian-installer", "binary-" + arch)249 touch_list(comp, "debian-installer", "binary-" + arch)
@@ -771,8 +775,11 @@
771 """Generates the config stanza for an individual pocket."""775 """Generates the config stanza for an individual pocket."""
772 suite = distroseries.getSuite(pocket)776 suite = distroseries.getSuite(pocket)
773777
774 archs = self._config.archTagsForSeries(distroseries.name)778 archs = [
775 comps = self._config.componentsForSeries(distroseries.name)779 a.architecturetag for a in distroseries.enabled_architectures]
780 comps = [
781 comp.name for comp in
782 self.publisher.archive.getComponentsForSeries(distroseries)]
776783
777 self.log.debug("Generating apt config for %s" % suite)784 self.log.debug("Generating apt config for %s" % suite)
778 apt_config.write(STANZA_TEMPLATE % {785 apt_config.write(STANZA_TEMPLATE % {
779786
=== modified file 'lib/lp/archivepublisher/publishing.py'
--- lib/lp/archivepublisher/publishing.py 2010-10-15 10:35:15 +0000
+++ lib/lp/archivepublisher/publishing.py 2010-11-02 21:51:48 +0000
@@ -298,12 +298,8 @@
298298
299 self.release_files_needed.add((distroseries.name, pocket))299 self.release_files_needed.add((distroseries.name, pocket))
300300
301 # Retrieve components from the publisher config because301 components = self.archive.getComponentsForSeries(distroseries)
302 # it gets overridden in getPubConfig to set the302 for component in components:
303 # correct components for the archive being used.
304 for component_name in self._config.componentsForSeries(
305 distroseries.name):
306 component = getUtility(IComponentSet)[component_name]
307 self._writeComponentIndexes(303 self._writeComponentIndexes(
308 distroseries, pocket, component)304 distroseries, pocket, component)
309305
@@ -450,8 +446,11 @@
450 # and pocket, don't!446 # and pocket, don't!
451 return447 return
452448
453 all_components = self._config.componentsForSeries(distroseries.name)449 all_components = [
454 all_architectures = self._config.archTagsForSeries(distroseries.name)450 comp.name for comp in
451 self.archive.getComponentsForSeries(distroseries)]
452 all_architectures = [
453 a.architecturetag for a in distroseries.enabled_architectures]
455 all_files = set()454 all_files = set()
456 for component in all_components:455 for component in all_components:
457 self._writeSuiteSource(456 self._writeSuiteSource(
458457
=== modified file 'lib/lp/archivepublisher/tests/publisher-config.txt'
--- lib/lp/archivepublisher/tests/publisher-config.txt 2010-08-23 16:51:11 +0000
+++ lib/lp/archivepublisher/tests/publisher-config.txt 2010-11-02 21:51:48 +0000
@@ -22,13 +22,7 @@
22 ... for attr_name in config_attributes:22 ... for attr_name in config_attributes:
23 ... print '%s: %s' % (attr_name, getattr(config, attr_name))23 ... print '%s: %s' % (attr_name, getattr(config, attr_name))
24 ... for distroseries_name in sorted(config.distroSeriesNames()):24 ... for distroseries_name in sorted(config.distroSeriesNames()):
25 ... print '%s:' % distroseries_name25 ... print '%s' % distroseries_name
26 ... sorted_arches = sorted(
27 ... config.archTagsForSeries(distroseries_name))
28 ... print 'Architectures:', ', '.join(sorted_arches)
29 ... sorted_components = sorted(
30 ... config.componentsForSeries(distroseries_name))
31 ... print 'Components:', ', '.join(sorted_components)
3226
3327
34== Primary ==28== Primary ==
@@ -49,12 +43,8 @@
49 cacheroot: /var/tmp/archive/ubuntutest-cache43 cacheroot: /var/tmp/archive/ubuntutest-cache
50 miscroot: /var/tmp/archive/ubuntutest-misc44 miscroot: /var/tmp/archive/ubuntutest-misc
51 temproot: /var/tmp/archive/ubuntutest-temp45 temproot: /var/tmp/archive/ubuntutest-temp
52 breezy-autotest:46 breezy-autotest
53 Architectures:47 hoary-test
54 Components: main, multiverse, restricted, universe
55 hoary-test:
56 Architectures: amd64, i386
57 Components: main, multiverse, restricted, universe
5848
5949
60== PPAs ==50== PPAs ==
@@ -98,12 +88,8 @@
98 cacheroot: None88 cacheroot: None
99 miscroot: None89 miscroot: None
100 temproot: /var/tmp/archive/ubuntutest-temp90 temproot: /var/tmp/archive/ubuntutest-temp
101 breezy-autotest:91 breezy-autotest
102 Architectures:92 hoary-test
103 Components: main, multiverse, restricted, universe
104 hoary-test:
105 Architectures: amd64, i386
106 Components: main, multiverse, restricted, universe
10793
108There is a separate location for private PPAs that is used if the94There is a separate location for private PPAs that is used if the
109archive is marked as private:95archive is marked as private:
@@ -133,12 +119,8 @@
133 cacheroot: None119 cacheroot: None
134 miscroot: None120 miscroot: None
135 temproot: /var/tmp/archive/ubuntutest-temp121 temproot: /var/tmp/archive/ubuntutest-temp
136 breezy-autotest:122 breezy-autotest
137 Architectures:123 hoary-test
138 Components: main, multiverse, restricted, universe
139 hoary-test:
140 Architectures: amd64, i386
141 Components: main, multiverse, restricted, universe
142124
143125
144== Partner ==126== Partner ==
@@ -163,12 +145,8 @@
163 cacheroot: None145 cacheroot: None
164 miscroot: None146 miscroot: None
165 temproot: /var/tmp/archive/ubuntutest-temp147 temproot: /var/tmp/archive/ubuntutest-temp
166 breezy-autotest:148 breezy-autotest
167 Architectures:149 hoary-test
168 Components: partner
169 hoary-test:
170 Architectures: amd64, i386
171 Components: partner
172150
173151
174== DEBUG ==152== DEBUG ==
@@ -194,12 +172,8 @@
194 cacheroot: None172 cacheroot: None
195 miscroot: None173 miscroot: None
196 temproot: /var/tmp/archive/ubuntutest-temp174 temproot: /var/tmp/archive/ubuntutest-temp
197 breezy-autotest:175 breezy-autotest
198 Architectures:176 hoary-test
199 Components: main, multiverse, restricted, universe
200 hoary-test:
201 Architectures: amd64, i386
202 Components: main, multiverse, restricted, universe
203177
204178
205== COPY ==179== COPY ==
@@ -223,9 +197,5 @@
223 cacheroot: /var/tmp/archive/ubuntutest-rebuildtest99/ubuntutest-cache197 cacheroot: /var/tmp/archive/ubuntutest-rebuildtest99/ubuntutest-cache
224 miscroot: /var/tmp/archive/ubuntutest-rebuildtest99/ubuntutest-misc198 miscroot: /var/tmp/archive/ubuntutest-rebuildtest99/ubuntutest-misc
225 temproot: /var/tmp/archive/ubuntutest-rebuildtest99/ubuntutest-temp199 temproot: /var/tmp/archive/ubuntutest-rebuildtest99/ubuntutest-temp
226 breezy-autotest:200 breezy-autotest
227 Architectures:201 hoary-test
228 Components: main, multiverse, restricted, universe
229 hoary-test:
230 Architectures: amd64, i386
231 Components: main, multiverse, restricted, universe
232202
=== modified file 'lib/lp/archivepublisher/tests/test_config.py'
--- lib/lp/archivepublisher/tests/test_config.py 2010-10-20 20:51:26 +0000
+++ lib/lp/archivepublisher/tests/test_config.py 2010-11-02 21:51:48 +0000
@@ -33,10 +33,6 @@
33 self.assertEquals(len(dsns), 2)33 self.assertEquals(len(dsns), 2)
34 self.assertEquals(dsns[0], "breezy-autotest")34 self.assertEquals(dsns[0], "breezy-autotest")
35 self.assertEquals(dsns[1], "hoary-test")35 self.assertEquals(dsns[1], "hoary-test")
36 self.assertRaises(LucilleConfigError,
37 d.archTagsForSeries, "somename")
38 self.assertRaises(LucilleConfigError,
39 d.archTagsForSeries, "unknown")
4036
41 def testInstantiate(self):37 def testInstantiate(self):
42 """Config should instantiate"""38 """Config should instantiate"""
@@ -55,12 +51,6 @@
55 self.assertEquals(dsns[0], "breezy-autotest")51 self.assertEquals(dsns[0], "breezy-autotest")
56 self.assertEquals(dsns[1], "hoary-test")52 self.assertEquals(dsns[1], "hoary-test")
5753
58 def testArchTagsForSeries(self):
59 """Config should have the arch tags for the drs"""
60 d = Config(self.ubuntutest)
61 archs = d.archTagsForSeries("hoary-test")
62 self.assertEquals(len(archs), 2)
63
64 def testDistroConfig(self):54 def testDistroConfig(self):
65 """Config should have parsed a distro config"""55 """Config should have parsed a distro config"""
66 d = Config(self.ubuntutest)56 d = Config(self.ubuntutest)
6757
=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py 2010-11-02 06:21:58 +0000
+++ lib/lp/registry/interfaces/distroseries.py 2010-11-02 21:51:48 +0000
@@ -390,6 +390,9 @@
390 # DistroArchSeries lookup properties/methods.390 # DistroArchSeries lookup properties/methods.
391 architectures = Attribute("All architectures in this series.")391 architectures = Attribute("All architectures in this series.")
392392
393 enabled_architectures = Attribute(
394 "All architectures in this series with the 'enabled' flag set.")
395
393 virtualized_architectures = Attribute(396 virtualized_architectures = Attribute(
394 "All architectures in this series where PPA is supported.")397 "All architectures in this series where PPA is supported.")
395398
396399
=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py 2010-11-02 06:21:58 +0000
+++ lib/lp/registry/model/distroseries.py 2010-11-02 21:51:48 +0000
@@ -358,6 +358,15 @@
358 return None358 return None
359359
360 @property360 @property
361 def enabled_architectures(self):
362 store = Store.of(self)
363 results = store.find(
364 DistroArchSeries,
365 DistroArchSeries.distroseries == self,
366 DistroArchSeries.enabled == True)
367 return results.order_by(DistroArchSeries.architecturetag)
368
369 @property
361 def buildable_architectures(self):370 def buildable_architectures(self):
362 store = Store.of(self)371 store = Store.of(self)
363 origin = [372 origin = [
364373
=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt 2010-10-09 16:36:22 +0000
+++ lib/lp/soyuz/doc/archive.txt 2010-11-02 21:51:48 +0000
@@ -46,6 +46,8 @@
46 True46 True
47 >>> cprov_archive.is_main47 >>> cprov_archive.is_main
48 False48 False
49 >>> cprov_archive.is_partner
50 False
49 >>> cprov_archive.is_active51 >>> cprov_archive.is_active
50 True52 True
51 >>> cprov_archive.distribution.main_archive.is_main53 >>> cprov_archive.distribution.main_archive.is_main
@@ -1365,6 +1367,8 @@
1365 ... ubuntutest, ArchivePurpose.PARTNER)1367 ... ubuntutest, ArchivePurpose.PARTNER)
1366 >>> print partner_archive.name1368 >>> print partner_archive.name
1367 partner1369 partner
1370 >>> print partner_archive.is_partner
1371 True
13681372
1369It explicitly fails when purpose is PPA, since such lookup should be1373It explicitly fails when purpose is PPA, since such lookup should be
1370restricted by archive owner.1374restricted by archive owner.
13711375
=== modified file 'lib/lp/soyuz/doc/distroarchseries.txt'
--- lib/lp/soyuz/doc/distroarchseries.txt 2010-10-19 01:46:38 +0000
+++ lib/lp/soyuz/doc/distroarchseries.txt 2010-11-02 21:51:48 +0000
@@ -33,6 +33,17 @@
33 >>> print hoary_i386.enabled33 >>> print hoary_i386.enabled
34 True34 True
3535
36`DistroSeries.enabled_architectures` is a `ResultSet` containing the
37architectures with that flag set.
38
39 >>> hoary_i386 in hoary.enabled_architectures
40 True
41 >>> from lp.testing import celebrity_logged_in
42 >>> with celebrity_logged_in('admin'):
43 ... hoary_i386.enabled = False
44 >>> hoary_i386 in hoary.enabled_architectures
45 False
46
3647
37DistroArchSeries can tell you about their published releases48DistroArchSeries can tell you about their published releases
38============================================================49============================================================
3950
=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py 2010-10-28 14:38:22 +0000
+++ lib/lp/soyuz/interfaces/archive.py 2010-11-02 21:51:48 +0000
@@ -337,6 +337,8 @@
337337
338 is_ppa = Attribute("True if this archive is a PPA.")338 is_ppa = Attribute("True if this archive is a PPA.")
339339
340 is_partner = Attribute("True if this archive is a partner archive.")
341
340 is_copy = Attribute("True if this archive is a copy archive.")342 is_copy = Attribute("True if this archive is a copy archive.")
341343
342 is_main = Bool(344 is_main = Bool(
@@ -462,6 +464,12 @@
462 :return: True or False464 :return: True or False
463 """465 """
464466
467 def getComponentsForSeries(distroseries):
468 """Calculate the components available for use in this archive.
469
470 :return: An `IResultSet` of `IComponent` objects.
471 """
472
465 def updateArchiveCache():473 def updateArchiveCache():
466 """Concentrate cached information about the archive contents.474 """Concentrate cached information about the archive contents.
467475
468476
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py 2010-10-29 13:17:00 +0000
+++ lib/lp/soyuz/model/archive.py 2010-11-02 21:51:48 +0000
@@ -351,6 +351,11 @@
351 return self.purpose == ArchivePurpose.PPA351 return self.purpose == ArchivePurpose.PPA
352352
353 @property353 @property
354 def is_partner(self):
355 """See `IArchive`."""
356 return self.purpose == ArchivePurpose.PARTNER
357
358 @property
354 def is_copy(self):359 def is_copy(self):
355 """See `IArchive`."""360 """See `IArchive`."""
356 return self.purpose == ArchivePurpose.COPY361 return self.purpose == ArchivePurpose.COPY
@@ -835,6 +840,12 @@
835840
836 return permission841 return permission
837842
843 def getComponentsForSeries(self, distroseries):
844 if self.is_partner:
845 return [getUtility(IComponentSet)['partner']]
846 else:
847 return distroseries.components
848
838 def updateArchiveCache(self):849 def updateArchiveCache(self):
839 """See `IArchive`."""850 """See `IArchive`."""
840 # Compiled regexp to remove puntication.851 # Compiled regexp to remove puntication.
@@ -1102,7 +1113,7 @@
11021113
1103 def checkUploadToPocket(self, distroseries, pocket):1114 def checkUploadToPocket(self, distroseries, pocket):
1104 """See `IArchive`."""1115 """See `IArchive`."""
1105 if self.purpose == ArchivePurpose.PARTNER:1116 if self.is_partner:
1106 if pocket not in (1117 if pocket not in (
1107 PackagePublishingPocket.RELEASE,1118 PackagePublishingPocket.RELEASE,
1108 PackagePublishingPocket.PROPOSED):1119 PackagePublishingPocket.PROPOSED):
11091120
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py 2010-10-30 12:00:34 +0000
+++ lib/lp/soyuz/tests/test_archive.py 2010-11-02 21:51:48 +0000
@@ -52,6 +52,7 @@
52from lp.soyuz.model.binarypackagerelease import (52from lp.soyuz.model.binarypackagerelease import (
53 BinaryPackageReleaseDownloadCount,53 BinaryPackageReleaseDownloadCount,
54 )54 )
55from lp.soyuz.model.component import ComponentSelection
55from lp.soyuz.tests.test_publishing import SoyuzTestPublisher56from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
56from lp.testing import (57from lp.testing import (
57 ANONYMOUS,58 ANONYMOUS,
@@ -1423,6 +1424,7 @@
1423 self.assertEqual(set([ap]),1424 self.assertEqual(set([ap]),
1424 set(archive.getComponentsForUploader(person)))1425 set(archive.getComponentsForUploader(person)))
14251426
1427
1426class TestvalidatePPA(TestCaseWithFactory):1428class TestvalidatePPA(TestCaseWithFactory):
14271429
1428 layer = DatabaseFunctionalLayer1430 layer = DatabaseFunctionalLayer
@@ -1446,3 +1448,37 @@
1446 def test_valid_ppa(self):1448 def test_valid_ppa(self):
1447 ppa_owner = self.factory.makePerson()1449 ppa_owner = self.factory.makePerson()
1448 self.assertEqual(None, Archive.validatePPA(ppa_owner, None))1450 self.assertEqual(None, Archive.validatePPA(ppa_owner, None))
1451
1452
1453class TestGetComponentsForSeries(TestCaseWithFactory):
1454 """Tests for Archive.getComponentsForSeries."""
1455
1456 layer = DatabaseFunctionalLayer
1457
1458 def setUp(self):
1459 super(TestGetComponentsForSeries, self).setUp()
1460 self.series = self.factory.makeDistroSeries()
1461 self.comp1 = self.factory.makeComponent()
1462 self.comp2 = self.factory.makeComponent()
1463
1464 def test_series_components_for_primary_archive(self):
1465 # The primary archive uses the series' defined components.
1466 archive = self.factory.makeArchive()
1467 self.assertEquals(
1468 0, archive.getComponentsForSeries(self.series).count())
1469
1470 ComponentSelection(distroseries=self.series, component=self.comp1)
1471 ComponentSelection(distroseries=self.series, component=self.comp2)
1472
1473 self.assertEquals(
1474 set((self.comp1, self.comp2)),
1475 set(archive.getComponentsForSeries(self.series)))
1476
1477 def test_partner_component_for_partner_archive(self):
1478 # The partner archive always uses only the 'partner' component.
1479 archive = self.factory.makeArchive(purpose=ArchivePurpose.PARTNER)
1480 ComponentSelection(distroseries=self.series, component=self.comp1)
1481 partner_comp = getUtility(IComponentSet)['partner']
1482 self.assertEquals(
1483 [partner_comp],
1484 list(archive.getComponentsForSeries(self.series)))