← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~wgrant/launchpad/the-death-of-lucille into lp:launchpad/db-devel

 

William Grant has proposed merging lp:~wgrant/launchpad/the-death-of-lucille into lp:launchpad/db-devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #712249 lucille must perish
  https://bugs.launchpad.net/bugs/712249

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/the-death-of-lucille/+merge/48424

This branch removes the last references to lucille. Pretty trivial.
-- 
https://code.launchpad.net/~wgrant/launchpad/the-death-of-lucille/+merge/48424
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/the-death-of-lucille into lp:launchpad/db-devel.
=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2011-02-01 18:52:06 +0000
+++ database/schema/security.cfg	2011-02-03 04:11:37 +0000
@@ -804,8 +804,7 @@
 public.binarypackagepublishinghistory           = SELECT, INSERT, UPDATE, DELETE
 public.sourcepackagepublishinghistory           = SELECT, INSERT, UPDATE, DELETE
 
-[lucille]
-# Soyuz archive publisher.
+[archivepublisher]
 type=user
 groups=write,script
 public.archive                                  = SELECT, UPDATE

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2011-02-02 06:31:53 +0000
+++ lib/canonical/config/schema-lazr.conf	2011-02-03 04:11:37 +0000
@@ -22,7 +22,7 @@
 [archivepublisher]
 # The database user which will be used by this process.
 # datatype: string
-dbuser: lucille
+dbuser: archivepublisher
 
 # Base directory for distribution archives.
 # datatype: string

=== modified file 'lib/lp/poppy/daemon.py'
--- lib/lp/poppy/daemon.py	2010-08-20 20:31:18 +0000
+++ lib/lp/poppy/daemon.py	2011-02-03 04:11:37 +0000
@@ -51,7 +51,7 @@
 
     root, port = args
     host = "0.0.0.0"
-    ident = "lucille upload server"
+    ident = "Launchpad upload server"
     numthreads = 4
 
     hooks = Hooks(root, log, allow_user=options.allow_user, cmd=options.cmd,

=== modified file 'lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt'
--- lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2010-12-22 20:46:21 +0000
+++ lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2011-02-03 04:11:37 +0000
@@ -223,7 +223,7 @@
 Then, supersede all pmount publications in warty for pmount (this sets
 us up to demonstrate bug 208233).
 
-  >>> LaunchpadZopelessLayer.switchDbUser('lucille')
+  >>> LaunchpadZopelessLayer.switchDbUser('archivepublisher')
   >>> from lp.soyuz.model.binarypackagename import BinaryPackageName
   >>> from lp.soyuz.model.distroarchseries import DistroArchSeries
   >>> from lp.soyuz.model.distroarchseriesbinarypackage import (

=== modified file 'utilities/soyuz-sampledata-setup.py'
--- utilities/soyuz-sampledata-setup.py	2010-08-24 13:56:22 +0000
+++ utilities/soyuz-sampledata-setup.py	2011-02-03 04:11:37 +0000
@@ -169,13 +169,6 @@
         removeSecurityProxy(ppa).publish = False
 
 
-def set_lucille_config(distribution):
-    """Set lucilleconfig on all series of `distribution`."""
-    for series in distribution.series:
-        removeSecurityProxy(series).lucilleconfig = '''[publishing]
-components = main restricted universe multiverse'''
-
-
 def add_architecture(distroseries, architecture_name):
     """Add a DistroArchSeries for the given architecture to `distroseries`."""
     # Avoid circular import.
@@ -300,10 +293,6 @@
     """Set up sample data on `distribution`."""
     parent_series = distribution.getSeries(parent_series_name)
 
-    # Set up lucilleconfig on all series.  The sample data lacks this.
-    log.info("Setting lucilleconfig...")
-    set_lucille_config(distribution)
-
     log.info("Configuring sections...")
     create_sections(parent_series)
     add_architecture(parent_series, 'amd64')