launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/archive-permission-sampledata into lp:launchpad.

Requested reviews:
  William Grant (wgrant): code
Related bugs:
  Bug #887185 in Launchpad itself: "ArchivePermission allows duplicated rows"
  https://bugs.launchpad.net/launchpad/+bug/887185

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/archive-permission-sampledata/+merge/103282

Another bit of bug 887185; remove obviously duplicated rows from sampledata ArchivePermission, and tweak an associated test.
-- 
https://code.launchpad.net/~cjwatson/launchpad/archive-permission-sampledata/+merge/103282
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2012-03-20 04:20:54 +0000
+++ database/sampledata/current-dev.sql	2012-04-24 13:40:25 +0000
@@ -2273,7 +2273,6 @@
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (7, '2006-10-16 18:31:43.465111', 17, 2, 1, 2, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (8, '2006-10-16 18:31:43.465111', 17, 2, 1, 3, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (9, '2006-10-16 18:31:43.465111', 17, 2, 1, 5, NULL, NULL, false);
-INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (10, '2006-10-16 18:31:43.465111', 17, 2, 1, 5, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (11, '2006-10-16 18:31:43.465111', 13, 1, 1, NULL, 1, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (12, '2006-10-16 18:31:43.465111', 243620, 1, 12, 5, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (13, '2006-10-16 18:31:43.465111', 12, 2, 1, 1, NULL, NULL, false);

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2012-03-20 04:20:54 +0000
+++ database/sampledata/current.sql	2012-04-24 13:40:25 +0000
@@ -2267,7 +2267,6 @@
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (6, '2006-10-16 18:31:43.465111', 17, 2, 1, 1, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (7, '2006-10-16 18:31:43.465111', 17, 2, 1, 2, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (8, '2006-10-16 18:31:43.465111', 17, 2, 1, 3, NULL, NULL, false);
-INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (9, '2006-10-16 18:31:43.465111', 17, 2, 1, 5, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (10, '2006-10-16 18:31:43.465111', 17, 2, 1, 5, NULL, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (11, '2006-10-16 18:31:43.465111', 13, 1, 1, NULL, 1, NULL, false);
 INSERT INTO archivepermission (id, date_created, person, permission, archive, component, sourcepackagename, packageset, explicit) VALUES (12, '2006-10-16 18:31:43.465111', 243620, 1, 12, 5, NULL, NULL, false);

=== modified file 'lib/lp/soyuz/doc/archivepermission.txt'
--- lib/lp/soyuz/doc/archivepermission.txt	2011-12-24 17:49:30 +0000
+++ lib/lp/soyuz/doc/archivepermission.txt	2012-04-24 13:40:25 +0000
@@ -124,7 +124,7 @@
     >>> permissions = permission_set.permissionsForPerson(
     ...     ubuntu.main_archive,  ubuntu_team)
     >>> permissions.count()
-    8
+    7
 
 uploadersForComponent() returns ArchivePermission records where a person
 or team has permission to upload to the supplied component: