Merge lp:~abentley/launchpad/daily-builds-ui into lp:launchpad

[Aaron Bentley]

Provide UI for daily builds

= Summary =
Fix bug #586944: Launchpad should provide a ui for daily builds.

== Proposed fix ==
Allow users to specify that a recipe should be built daily using the web UI.

== Pre-implementation notes ==
None

== Implementation details ==
Allow user to control build_daily and daily_build_archive settings

== Tests ==
bin/test -t test_create_recipe_no_distroseries

== Demo and Q/A ==
Create a recipe. Enable daily builds. Select an archive of your choice.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  cronscripts/request_daily_builds.py
  lib/lp/code/model/tests/test_sourcepackagerecipebuild.py
  lib/lp/code/interfaces/sourcepackagerecipebuild.py
  lib/lp/code/configure.zcml
  lib/canonical/config/schema-lazr.conf
  lib/lp/soyuz/model/publishing.py
  lib/lp/code/scripts/tests/test_request_daily_builds.py
  database/schema/security.cfg
  lib/lp/soyuz/doc/buildd-slavescanner.txt
  lib/lp/soyuz/stories/soyuz/xx-build-record.txt
  lib/lp/code/model/tests/test_sourcepackagerecipe.py
  lib/lp/testing/factory.py
  lib/lp/code/model/sourcepackagerecipebuild.py
  lib/lp/code/templates/sourcepackagerecipe-index.pt
  lib/lp/buildmaster/model/buildqueue.py
  lib/lp/soyuz/doc/buildd-dispatching.txt
  lib/lp/code/browser/sourcepackagerecipe.py
  lib/lp/code/model/sourcepackagerecipe.py
  lib/lp/code/browser/tests/test_sourcepackagerecipe.py
  configs/testrunner/launchpad-lazr.conf
  lib/lp/code/interfaces/sourcepackagerecipe.py
  lib/lp/registry/model/person.py
  lib/lp/soyuz/doc/build.txt

== Pyflakes Doctest notices ==

lib/lp/soyuz/doc/buildd-slavescanner.txt
    689: local variable 'pub_binaries' is assigned to but never used

== Pyflakes notices ==

cronscripts/request_daily_builds.py
    19: 'canonical' imported but unused

    ^^^ fix for circular imports

== Pylint notices ==

cronscripts/request_daily_builds.py
    19: [W0611] Unused import canonical

    ^^^ fix for circular imports

lib/lp/code/model/sourcepackagerecipebuild.py
    207: [W0702, SourcePackageRecipeBuild.makeDailyBuilds] No exception type(s) specified

    ^^^ expected; this is a generic error handler.

lib/lp/code/interfaces/sourcepackagerecipe.py
    150: [C0322, ISourcePackageRecipe.requestBuild] Operator not preceded by a space
    distroseries=Reference(schema=IDistroSeries),
    ^
    )
    @export_write_operation()
    def requestBuild(archive, distroseries, requester, pocket):

    ^^^ bogus

lib/lp/registry/model/person.py
    1265: [W0104, Person.addMember] Statement seems to have no effect

    ^^^ read to force a flush.

[Paul Hummer (rockstar)]

Man, these make for better diffs...

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2010-06-11 18:57:02 +0000
+++ Makefile	2010-06-14 20:18:33 +0000
@@ -250,7 +250,7 @@
 	bin/run -r librarian,sftp,codebrowse -i $(LPCONFIG)
 
 
-start_librarian: build
+start_librarian: compile
 	bin/start_librarian
 
 stop_librarian:

=== removed file 'cronscripts/calculate-bug-heat.py'
--- cronscripts/calculate-bug-heat.py	2010-04-27 19:48:39 +0000
+++ cronscripts/calculate-bug-heat.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#!/usr/bin/python -S
-#
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=W0403
-
-"""Calculate bug heat."""
-
-__metaclass__ = type
-
-import _pythonpath
-
-from canonical.launchpad.webapp import errorlog
-
-from lp.services.job.runner import JobCronScript
-from lp.bugs.interfaces.bugjob import ICalculateBugHeatJobSource
-
-
-class RunCalculateBugHeat(JobCronScript):
-    """Run BranchScanJob jobs."""
-
-    config_name = 'calculate_bug_heat'
-    source_interface = ICalculateBugHeatJobSource
-
-    def main(self):
-        errorlog.globalErrorUtility.configure(self.config_name)
-        return super(RunCalculateBugHeat, self).main()
-
-
-if __name__ == '__main__':
-    script = RunCalculateBugHeat()
-    script.lock_and_run()

=== modified file 'cronscripts/publishing/maintenance-check.py'
--- cronscripts/publishing/maintenance-check.py	2010-04-23 13:43:19 +0000
+++ cronscripts/publishing/maintenance-check.py	2010-06-14 20:18:33 +0000
@@ -350,7 +350,7 @@
             except:
                 logging.exception("can not parse line '%s'" % line)
     except urllib2.HTTPError, e:
-        if e.getcode() != 404:
+        if e.code != 404:
             raise
         sys.stderr.write("hints-file: %s gave 404 error\n" % hints_file)
     

=== modified file 'database/replication/helpers.py'
--- database/replication/helpers.py	2010-04-29 12:38:05 +0000
+++ database/replication/helpers.py	2010-06-14 20:18:33 +0000
@@ -44,7 +44,6 @@
     ('public', 'nameblacklist'),
     ('public', 'openidconsumerassociation'),
     ('public', 'openidconsumernonce'),
-    ('public', 'oauthnonce'),
     ('public', 'codeimportmachine'),
     ('public', 'scriptactivity'),
     ('public', 'standardshipitrequest'),
@@ -71,6 +70,8 @@
     # Database statistics
     'public.databasetablestats',
     'public.databasecpustats',
+    # Don't replicate OAuthNonce - too busy and no real gain.
+    'public.oauthnonce',
     # Ubuntu SSO database. These tables where created manually by ISD
     # and the Launchpad scripts should not mess with them. Eventually
     # these tables will be in a totally separate database.
@@ -353,6 +354,9 @@
 
     A replication set must contain all tables linked by foreign key
     reference to the given table, and sequences used to generate keys.
+    Tables and sequences can be added to the IGNORED_TABLES and
+    IGNORED_SEQUENCES lists for cases where we known can safely ignore
+    this restriction.
 
     :param seeds: [(namespace, tablename), ...]
 
@@ -420,7 +424,8 @@
             """ % sqlvalues(namespace, tablename))
         for namespace, tablename in cur.fetchall():
             key = (namespace, tablename)
-            if key not in tables and key not in pending_tables:
+            if (key not in tables and key not in pending_tables
+                and '%s.%s' % (namespace, tablename) not in IGNORED_TABLES):
                 pending_tables.add(key)
 
     # Generate the set of sequences that are linked to any of our set of
@@ -441,8 +446,9 @@
                 ) AS whatever
             WHERE seq IS NOT NULL;
             """ % sqlvalues(fqn(namespace, tablename), namespace, tablename))
-        for row in cur.fetchall():
-            sequences.add(row[0])
+        for sequence, in cur.fetchall():
+            if sequence not in IGNORED_SEQUENCES:
+                sequences.add(sequence)
 
     # We can't easily convert the sequence name to (namespace, name) tuples,
     # so we might as well convert the tables to dot notation for consistancy.

=== modified file 'database/replication/new-slave.py'
--- database/replication/new-slave.py	2010-05-19 18:07:56 +0000
+++ database/replication/new-slave.py	2010-06-14 20:18:33 +0000
@@ -188,6 +188,9 @@
 
     script += dedent("""\
         } on error { echo 'Failed.'; exit 1; }
+
+        echo 'You may need to restart the Slony daemons now. If the first';
+        echo 'of the following syncs passes then there is no need.';
         """)
 
     full_sync = []
@@ -200,6 +203,7 @@
             wait for event (
                 origin = @%(nickname)s, confirmed=ALL,
                 wait on = @%(nickname)s, timeout=0);
+            echo 'Ok. Replication syncing fine with new node.';
             """ % {'nickname': nickname}))
     full_sync = '\n'.join(full_sync)
     script += full_sync
@@ -210,6 +214,7 @@
         subscribe set (
             id=%d, provider=@master_node, receiver=@new_node, forward=yes);
         echo 'Waiting for subscribe to start processing.';
+        echo 'This will block on long running transactions.';
         sync (id = @master_node);
         wait for event (
             origin = @master_node, confirmed = ALL,

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2010-05-27 22:18:16 +0000
+++ database/schema/comments.sql	2010-06-14 20:18:33 +0000
@@ -1350,6 +1350,7 @@
 COMMENT ON COLUMN SourcePackageRecipe.owner IS 'The person or team who can edit this recipe.';
 COMMENT ON COLUMN SourcePackageRecipe.name IS 'The name of the recipe in the web/URL.';
 COMMENT ON COLUMN SourcePackageRecipe.build_daily IS 'If true, this recipe should be built daily.';
+COMMENT ON COLUMN SourcePackageRecipe.is_stale IS 'True if this recipe has not been built since a branch was updated.';
 
 COMMENT ON COLUMN SourcePackageREcipe.daily_build_archive IS 'The archive to build into for daily builds.';
 
@@ -1371,6 +1372,7 @@
 COMMENT ON COLUMN SourcePackageRecipeBuild.date_first_dispatched IS 'The instant the build was dispatched the first time. This value will not get overridden if the build is retried.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.requester IS 'Who requested the build.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.recipe IS 'The recipe being processed.';
+COMMENT ON COLUMN SourcePackageRecipeBuild.manifest IS 'The evaluated recipe that was built.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.archive IS 'The archive the source package will be built in and uploaded to.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.pocket IS 'The pocket the source package will be built in and uploaded to.';
 COMMENT ON COLUMN SourcePackageRecipeBuild.dependencies IS 'The missing build dependencies, if any.';

=== modified file 'database/schema/fti.py'
--- database/schema/fti.py	2010-05-19 18:07:56 +0000
+++ database/schema/fti.py	2010-06-14 20:18:33 +0000
@@ -14,10 +14,10 @@
 import _pythonpath
 
 from distutils.version import LooseVersion
-import sys
 import os.path
 from optparse import OptionParser
-import popen2
+import subprocess
+import sys
 from tempfile import NamedTemporaryFile
 from textwrap import dedent
 import time
@@ -319,18 +319,15 @@
             cmd += ' -h %s' % lp.dbhost
         if options.dbuser:
             cmd += ' -U %s' % options.dbuser
-        p = popen2.Popen4(cmd)
-        c = p.tochild
-        print >> c, "SET client_min_messages=ERROR;"
-        print >> c, "CREATE SCHEMA ts2;"
-        print >> c, open(tsearch2_sql_path).read().replace(
-                'public;','ts2, public;'
-                )
-        p.tochild.close()
-        rv = p.wait()
-        if rv != 0:
+        p = subprocess.Popen(
+            cmd.split(' '), stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        out, err = p.communicate(
+            "SET client_min_messages=ERROR; CREATE SCHEMA ts2;"
+            + open(tsearch2_sql_path).read().replace('public;','ts2, public;'))
+        if p.returncode != 0:
             log.fatal('Error executing %s:', cmd)
-            log.debug(p.fromchild.read())
+            log.debug(out)
             sys.exit(rv)
 
     # Create ftq helper and its sibling _ftq.

=== added file 'database/schema/patch-2207-60-1.sql'
--- database/schema/patch-2207-60-1.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-60-1.sql	2010-06-14 20:18:33 +0000
@@ -0,0 +1,10 @@
+SET client_min_messages=ERROR;
+
+CREATE INDEX archive__require_virtualized__idx
+ON Archive(require_virtualized);
+
+CREATE INDEX buildfarmjob__status__idx
+ON BuildFarmJob(status);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 60, 1);
+

=== added file 'database/schema/patch-2207-61-0.sql'
--- database/schema/patch-2207-61-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-61-0.sql	2010-06-14 20:18:33 +0000
@@ -0,0 +1,13 @@
+-- Copyright 2010 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+ALTER TABLE SourcePackageRecipe ADD COLUMN is_stale BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE SourcePackageRecipeBuild ADD COLUMN manifest INTEGER REFERENCES SourcePackageRecipeData;
+
+CREATE INDEX sourcepackagerecipe__is_stale__build_daily__idx
+ON SourcepackageRecipe(is_stale, build_daily);
+
+CREATE INDEX sourcepackagerecipebuild__manifest__idx ON SourcepackageRecipeBuild(manifest);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 61, 0);

=== added file 'database/schema/patch-2207-62-0.sql'
--- database/schema/patch-2207-62-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-62-0.sql	2010-06-14 20:18:33 +0000
@@ -0,0 +1,14 @@
+SET client_min_messages=ERROR;
+
+-- Bug #49717
+ALTER TABLE SourcePackageRelease ALTER component SET NOT NULL;
+
+-- We are taking OAuthNonce out of replication, so we make the foreign
+-- key reference ON DELETE CASCADE so things don't explode when we
+-- shuffle the lpmain master around.
+ALTER TABLE OAuthNonce DROP CONSTRAINT oauthnonce__access_token__fk;
+ALTER TABLE OAuthNonce ADD CONSTRAINT oauthnonce__access_token__fk
+    FOREIGN KEY (access_token) REFERENCES OAuthAccessToken
+    ON DELETE CASCADE;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 62, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-06-08 15:13:20 +0000
+++ database/schema/security.cfg	2010-06-14 20:18:33 +0000
@@ -1847,6 +1847,7 @@
 type=user
 public.archive                          = SELECT
 public.buildfarmjob                     = SELECT
+public.databasereplicationlag           = SELECT
 public.packagebuild                     = SELECT
 public.binarypackagebuild               = SELECT
 public.buildqueue                       = SELECT

=== modified file 'database/schema/trusted.sql'
--- database/schema/trusted.sql	2010-05-28 10:36:08 +0000
+++ database/schema/trusted.sql	2010-06-14 20:18:33 +0000
@@ -144,6 +144,12 @@
         LIMIT 1
         """, 1).nrows() > 0
     if stats_reset:
+        # The database stats have been reset. We cannot calculate
+        # deltas because we do not know when this happened. So we trash
+        # our records as they are now useless to us. We could be more
+        # sophisticated about this, but this should only happen
+        # when an admin explicitly resets the statistics or if the
+        # database is rebuilt.
         plpy.notice("Stats wraparound. Purging DatabaseTableStats")
         plpy.execute("DELETE FROM DatabaseTableStats")
     else:
@@ -158,7 +164,8 @@
             SELECT
                 CURRENT_TIMESTAMP AT TIME ZONE 'UTC',
                 schemaname, relname, seq_scan, seq_tup_read,
-                idx_scan, idx_tup_fetch, n_tup_ins, n_tup_upd, n_tup_del,
+                coalesce(idx_scan, 0), coalesce(idx_tup_fetch, 0),
+                n_tup_ins, n_tup_upd, n_tup_del,
                 n_tup_hot_upd, n_live_tup, n_dead_tup, last_vacuum,
                 last_autovacuum, last_analyze, last_autoanalyze
             FROM pg_catalog.pg_stat_user_tables;

=== modified file 'lib/canonical/launchpad/scripts/garbo.py'
--- lib/canonical/launchpad/scripts/garbo.py	2010-06-11 07:26:03 +0000
+++ lib/canonical/launchpad/scripts/garbo.py	2010-06-14 20:18:33 +0000
@@ -33,7 +33,6 @@
 from lp.bugs.interfaces.bug import IBugSet
 from lp.bugs.model.bug import Bug
 from lp.bugs.model.bugattachment import BugAttachment
-from lp.bugs.interfaces.bugjob import ICalculateBugHeatJobSource
 from lp.bugs.model.bugnotification import BugNotification
 from lp.bugs.model.bugwatch import BugWatch
 from lp.bugs.scripts.checkwatches.scheduler import (

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-05-25 16:45:26 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-06-14 20:18:33 +0000
@@ -2646,7 +2646,7 @@
                 dict(
                     value=term.token, title=term.title or term.token,
                     checked=term.value in default_values))
-        return helpers.shortlist(widget_values, longest_expected=11)
+        return helpers.shortlist(widget_values, longest_expected=12)
 
     def getStatusWidgetValues(self):
         """Return data used to render the status checkboxes."""

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2010-05-25 14:50:42 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2010-06-14 20:18:33 +0000
@@ -245,8 +245,8 @@
             self.bug.default_bugtask, LaunchpadTestRequest())
         view.initialize()
         self.assertEqual(
-            ['New', 'Incomplete', 'Invalid', 'Confirmed', 'In Progress',
-             'Fix Committed', 'Fix Released'],
+            ['New', 'Incomplete', 'Opinion', 'Invalid', 'Confirmed',
+             'In Progress', 'Fix Committed', 'Fix Released'],
             self.getWidgetOptionTitles(view.form_fields['status']))
 
     def test_status_field_privileged_persons(self):
@@ -260,8 +260,9 @@
                 self.bug.default_bugtask, LaunchpadTestRequest())
             view.initialize()
             self.assertEqual(
-                ['New', 'Incomplete', 'Invalid', "Won't Fix", 'Confirmed',
-                 'Triaged', 'In Progress', 'Fix Committed', 'Fix Released'],
+                ['New', 'Incomplete', 'Opinion', 'Invalid', "Won't Fix",
+                 'Confirmed', 'Triaged', 'In Progress', 'Fix Committed',
+                 'Fix Released'],
                 self.getWidgetOptionTitles(view.form_fields['status']),
                 'Unexpected set of settable status options for %s'
                 % user.name)
@@ -278,8 +279,8 @@
             self.bug.default_bugtask, LaunchpadTestRequest())
         view.initialize()
         self.assertEqual(
-            ['New', 'Incomplete', 'Invalid', 'Confirmed', 'In Progress',
-             'Fix Committed', 'Fix Released', 'Unknown'],
+            ['New', 'Incomplete', 'Opinion', 'Invalid', 'Confirmed',
+             'In Progress', 'Fix Committed', 'Fix Released', 'Unknown'],
             self.getWidgetOptionTitles(view.form_fields['status']))
 
     def test_status_field_bug_task_in_status_expired(self):
@@ -292,8 +293,8 @@
             self.bug.default_bugtask, LaunchpadTestRequest())
         view.initialize()
         self.assertEqual(
-            ['New', 'Incomplete', 'Invalid', 'Expired', 'Confirmed',
-             'In Progress', 'Fix Committed', 'Fix Released'],
+            ['New', 'Incomplete', 'Opinion', 'Invalid', 'Expired',
+             'Confirmed', 'In Progress', 'Fix Committed', 'Fix Released'],
             self.getWidgetOptionTitles(view.form_fields['status']))
 
 

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-06-04 09:31:21 +0000
+++ lib/lp/bugs/configure.zcml	2010-06-14 20:18:33 +0000
@@ -969,18 +969,6 @@
         factory="lp.bugs.browser.bugtarget.BugsVHostBreadcrumb"
         permission="zope.Public"/>
 
-    <!-- CalculateBugHeatJobs -->
-    <class class="lp.bugs.model.bugheat.CalculateBugHeatJob">
-        <allow interface="lp.bugs.interfaces.bugjob.IBugJob" />
-        <allow interface="lp.bugs.interfaces.bugjob.ICalculateBugHeatJob"/>
-    </class>
-    <securedutility
-        component="lp.bugs.model.bugheat.CalculateBugHeatJob"
-        provides="lp.bugs.interfaces.bugjob.ICalculateBugHeatJobSource">
-        <allow
-            interface="lp.bugs.interfaces.bugjob.ICalculateBugHeatJobSource"/>
-    </securedutility>
-
     <!-- ProcessApportBlobJobs -->
     <class class="lp.bugs.model.apportjob.ProcessApportBlobJob">
         <allow interface="lp.bugs.interfaces.apportjob.IApportJob" />

=== modified file 'lib/lp/bugs/doc/bugtask-status-workflow.txt'
--- lib/lp/bugs/doc/bugtask-status-workflow.txt	2010-04-15 15:28:22 +0000
+++ lib/lp/bugs/doc/bugtask-status-workflow.txt	2010-06-14 20:18:33 +0000
@@ -145,7 +145,7 @@
     >>> ubuntu_firefox_task.date_inprogress is None
     True
 
-Marking the bug Triaged sets `date_triged`.
+Marking the bug Triaged sets `date_triaged`.
 
     >>> print ubuntu_firefox_task.date_triaged
     None
@@ -188,6 +188,16 @@
 
     >>> ubuntu_firefox_task.transitionToStatus(
     ...     BugTaskStatus.CONFIRMED, getUtility(ILaunchBag).user)
+    >>> ubuntu_firefox_task.date_closed is None
+    True
+
+    >>> ubuntu_firefox_task.transitionToStatus(
+    ...     BugTaskStatus.OPINION, getUtility(ILaunchBag).user)
+    >>> ubuntu_firefox_task.date_closed
+    datetime.datetime...
+
+    >>> ubuntu_firefox_task.transitionToStatus(
+    ...     BugTaskStatus.CONFIRMED, getUtility(ILaunchBag).user)
     >>> ubuntu_firefox_task.date_inprogress is None
     True
     >>> ubuntu_firefox_task.transitionToStatus(

=== modified file 'lib/lp/bugs/interfaces/bugjob.py'
--- lib/lp/bugs/interfaces/bugjob.py	2010-01-22 21:44:19 +0000
+++ lib/lp/bugs/interfaces/bugjob.py	2010-06-14 20:18:33 +0000
@@ -8,8 +8,6 @@
     'BugJobType',
     'IBugJob',
     'IBugJobSource',
-    'ICalculateBugHeatJob',
-    'ICalculateBugHeatJobSource',
     ]
 
 from zope.interface import Attribute, Interface
@@ -19,7 +17,7 @@
 
 from lazr.enum import DBEnumeratedType, DBItem
 from lp.bugs.interfaces.bug import IBug
-from lp.services.job.interfaces.job import IJob, IJobSource, IRunnableJob
+from lp.services.job.interfaces.job import IJob, IJobSource
 
 
 class BugJobType(DBEnumeratedType):
@@ -57,11 +55,3 @@
 
     def create(bug):
         """Create a new IBugJob for a bug."""
-
-
-class ICalculateBugHeatJob(IRunnableJob):
-    """A Job to calculate bug heat."""
-
-
-class ICalculateBugHeatJobSource(IBugJobSource):
-    """Interface for acquiring CalculateBugHeatJobs."""

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-06-07 19:48:29 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-06-14 20:18:33 +0000
@@ -159,6 +159,14 @@
         the user was visiting when the bug occurred, etc.
         """)
 
+    OPINION = DBItem(16, """
+        Opinion
+
+        The bug remains open for discussion only. This status is usually
+        used where there is disagreement over whether the bug is relevant
+        to the current target and whether it should be fixed.
+        """)
+
     INVALID = DBItem(17, """
         Invalid
 
@@ -235,8 +243,8 @@
 
     sort_order = (
         'NEW', 'INCOMPLETE_WITH_RESPONSE', 'INCOMPLETE_WITHOUT_RESPONSE',
-        'INCOMPLETE', 'INVALID', 'WONTFIX', 'EXPIRED', 'CONFIRMED', 'TRIAGED',
-        'INPROGRESS', 'FIXCOMMITTED', 'FIXRELEASED')
+        'INCOMPLETE',  'OPINION', 'INVALID', 'WONTFIX', 'EXPIRED',
+        'CONFIRMED', 'TRIAGED', 'INPROGRESS', 'FIXCOMMITTED', 'FIXRELEASED')
 
     INCOMPLETE_WITH_RESPONSE = DBItem(35, """
         Incomplete (with response)
@@ -312,6 +320,7 @@
 
 RESOLVED_BUGTASK_STATUSES = (
     BugTaskStatus.FIXRELEASED,
+    BugTaskStatus.OPINION,
     BugTaskStatus.INVALID,
     BugTaskStatus.WONTFIX,
     BugTaskStatus.EXPIRED)

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2010-06-10 18:55:22 +0000
+++ lib/lp/bugs/model/bug.py	2010-06-14 20:18:33 +0000
@@ -83,7 +83,6 @@
 from lp.bugs.interfaces.bugtracker import BugTrackerType
 from lp.bugs.interfaces.bugwatch import IBugWatchSet
 from lp.bugs.interfaces.cve import ICveSet
-from lp.bugs.scripts.bugheat import BugHeatConstants
 from lp.bugs.model.bugattachment import BugAttachment
 from lp.bugs.model.bugbranch import BugBranch
 from lp.bugs.model.bugcve import BugCve

=== removed file 'lib/lp/bugs/model/bugheat.py'
--- lib/lp/bugs/model/bugheat.py	2010-01-21 20:46:03 +0000
+++ lib/lp/bugs/model/bugheat.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Job classes related to BugJobs are in here."""
-
-__metaclass__ = type
-__all__ = [
-    'CalculateBugHeatJob',
-    ]
-
-from zope.component import getUtility
-from zope.interface import classProvides, implements
-
-from canonical.launchpad.webapp.interfaces import (
-    DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE)
-
-from lp.bugs.interfaces.bugjob import (
-    BugJobType, ICalculateBugHeatJob, ICalculateBugHeatJobSource)
-from lp.bugs.model.bugjob import BugJob, BugJobDerived
-from lp.bugs.scripts.bugheat import BugHeatCalculator
-from lp.services.job.model.job import Job
-
-
-class CalculateBugHeatJob(BugJobDerived):
-    """A Job to calculate bug heat."""
-    implements(ICalculateBugHeatJob)
-
-    class_job_type = BugJobType.UPDATE_HEAT
-    classProvides(ICalculateBugHeatJobSource)
-
-    def run(self):
-        """See `IRunnableJob`."""
-        calculator = BugHeatCalculator(self.bug)
-        calculated_heat = calculator.getBugHeat()
-        self.bug.setHeat(calculated_heat)
-
-    @classmethod
-    def create(cls, bug):
-        """See `ICalculateBugHeatJobSource`."""
-        # If there's already a job for the bug, don't create a new one.
-        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        job_for_bug = store.find(
-            BugJob,
-            BugJob.bug == bug,
-            BugJob.job_type == cls.class_job_type,
-            BugJob.job == Job.id,
-            Job.id.is_in(Job.ready_jobs)
-            ).any()
-
-        if job_for_bug is not None:
-            return cls(job_for_bug)
-        else:
-            return super(CalculateBugHeatJob, cls).create(bug)
-

=== removed file 'lib/lp/bugs/scripts/bugheat.py'
--- lib/lp/bugs/scripts/bugheat.py	2010-04-29 11:31:49 +0000
+++ lib/lp/bugs/scripts/bugheat.py	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""The innards of the Bug Heat cronscript."""
-
-__metaclass__ = type
-__all__ = [
-    'BugHeatCalculator',
-    'BugHeatConstants',
-    ]
-
-from datetime import datetime
-
-from lp.bugs.interfaces.bugtask import RESOLVED_BUGTASK_STATUSES
-
-class BugHeatConstants:
-
-    PRIVACY = 150
-    SECURITY = 250
-    DUPLICATE = 6
-    AFFECTED_USER = 4
-    SUBSCRIBER = 2
-
-
-class BugHeatCalculator:
-    """A class to calculate the heat for a bug."""
-    # If you change the way that bug heat is calculated, remember to update
-    # the description of how it is calculated at
-    # /lib/lp/bugs/help/bug-heat.html and
-    # https://help.launchpad.net/Bugs/BugHeat
-
-    def __init__(self, bug):
-        self.bug = bug
-
-    def _getHeatFromPrivacy(self):
-        """Return the heat generated by the bug's `private` attribute."""
-        if self.bug.private:
-            return BugHeatConstants.PRIVACY
-        else:
-            return 0
-
-    def _getHeatFromSecurity(self):
-        """Return the heat generated if the bug is security related."""
-        if self.bug.security_related:
-            return BugHeatConstants.SECURITY
-        else:
-            return 0
-
-    def _getHeatFromDuplicates(self):
-        """Return the heat generated by the bug's duplicates."""
-        return self.bug.duplicates.count() * BugHeatConstants.DUPLICATE
-
-    def _getHeatFromAffectedUsers(self):
-        """Return the heat generated by the bug's affected users."""
-        return (
-            self.bug.users_affected_count_with_dupes *
-            BugHeatConstants.AFFECTED_USER)
-
-    def _getHeatFromSubscribers(self):
-        """Return the heat generated by the bug's subscribers."""
-        direct_subscribers = self.bug.getDirectSubscribers()
-        subscribers_from_dupes = self.bug.getSubscribersFromDuplicates()
-
-        subscriber_count = (
-            len(direct_subscribers) + len(subscribers_from_dupes))
-        return subscriber_count * BugHeatConstants.SUBSCRIBER
-
-    def _bugIsComplete(self):
-        """Are all the tasks for this bug resolved?"""
-        return all([(task.status in RESOLVED_BUGTASK_STATUSES)
-                    for task in self.bug.bugtasks])
-
-    def getBugHeat(self):
-        """Return the total heat for the current bug."""
-        if self._bugIsComplete():
-            return 0
-
-        total_heat = sum([
-            self._getHeatFromAffectedUsers(),
-            self._getHeatFromDuplicates(),
-            self._getHeatFromPrivacy(),
-            self._getHeatFromSecurity(),
-            self._getHeatFromSubscribers(),
-            ])
-
-        # Bugs decay over time. Every day the bug isn't touched its heat
-        # decreases by 1%.
-        days = (
-            datetime.utcnow() -
-            self.bug.date_last_updated.replace(tzinfo=None)).days
-        total_heat = int(total_heat * (0.99 ** days))
-
-        if days > 0:
-            # Bug heat increases by a quarter of the maximum bug heat divided
-            # by the number of days since the bug's creation date.
-            days_since_last_activity = (
-                datetime.utcnow() -
-                max(self.bug.date_last_updated.replace(tzinfo=None),
-                    self.bug.date_last_message.replace(tzinfo=None))).days
-            days_since_created = (
-                datetime.utcnow() - self.bug.datecreated.replace(tzinfo=None)).days
-            max_heat = max(
-                task.target.max_bug_heat for task in self.bug.bugtasks)
-            if max_heat is not None and days_since_created > 0:
-                total_heat = total_heat + (max_heat * 0.25 / days_since_created)
-
-        return int(total_heat)
-

=== removed file 'lib/lp/bugs/scripts/tests/test_bugheat.py'
--- lib/lp/bugs/scripts/tests/test_bugheat.py	2010-04-29 11:31:49 +0000
+++ lib/lp/bugs/scripts/tests/test_bugheat.py	1970-01-01 00:00:00 +0000
@@ -1,256 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Module docstring goes here."""
-
-__metaclass__ = type
-
-import unittest
-
-from datetime import datetime, timedelta
-
-from canonical.testing import LaunchpadZopelessLayer
-
-from lp.bugs.interfaces.bugtask import BugTaskStatus
-from lp.bugs.scripts.bugheat import BugHeatCalculator, BugHeatConstants
-from lp.testing import TestCaseWithFactory
-
-from zope.security.proxy import removeSecurityProxy
-
-
-class TestBugHeatCalculator(TestCaseWithFactory):
-    """Tests for the BugHeatCalculator class."""
-    # If you change the way that bug heat is calculated, remember to update
-    # the description of how it is calculated at
-    # /lib/lp/bugs/help/bug-heat.html and
-    # https://help.launchpad.net/Bugs/BugHeat
-
-    layer = LaunchpadZopelessLayer
-
-    def setUp(self):
-        super(TestBugHeatCalculator, self).setUp()
-        self.bug = self.factory.makeBug()
-        self.calculator = BugHeatCalculator(self.bug)
-
-    def test__getHeatFromDuplicates(self):
-        # BugHeatCalculator._getHeatFromDuplicates() returns the bug
-        # heat generated by duplicates of a bug.
-        # By default, the bug has no heat from dupes
-        self.assertEqual(0, self.calculator._getHeatFromDuplicates())
-
-        # If adding duplicates, the heat generated by them will be n *
-        # BugHeatConstants.DUPLICATE, where n is the number of
-        # duplicates.
-        for i in range(5):
-            dupe = self.factory.makeBug()
-            dupe.duplicateof = self.bug
-
-        expected_heat = BugHeatConstants.DUPLICATE * 5
-        actual_heat = self.calculator._getHeatFromDuplicates()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Heat from duplicates does not match expected heat. "
-            "Expected %s, got %s" % (expected_heat, actual_heat))
-
-    def test__getHeatFromAffectedUsers(self):
-        # BugHeatCalculator._getHeatFromAffectedUsers() returns the bug
-        # heat generated by users affected by the bug and by duplicate bugs.
-        # By default, the heat will be BugHeatConstants.AFFECTED_USER, since
-        # there will be one affected user (the user who filed the bug).
-        self.assertEqual(
-            BugHeatConstants.AFFECTED_USER,
-            self.calculator._getHeatFromAffectedUsers())
-
-        # As the number of affected users increases, the heat generated
-        # will be n * BugHeatConstants.AFFECTED_USER, where n is the number
-        # of affected users.
-        for i in range(5):
-            person = self.factory.makePerson()
-            self.bug.markUserAffected(person)
-
-        expected_heat = BugHeatConstants.AFFECTED_USER * 6
-        actual_heat = self.calculator._getHeatFromAffectedUsers()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Heat from affected users does not match expected heat. "
-            "Expected %s, got %s" % (expected_heat, actual_heat))
-
-        # When our bug has duplicates, users affected by these duplicates
-        # are included in _getHeatFromAffectedUsers() of the main bug.
-        for i in range(3):
-            dupe = self.factory.makeBug()
-            dupe.duplicateof = self.bug
-        # Each bug reporter is by default also marked as being affected
-        # by the bug, so we have three additional affected users.
-        expected_heat += BugHeatConstants.AFFECTED_USER * 3
-
-        person = self.factory.makePerson()
-        dupe.markUserAffected(person)
-        expected_heat += BugHeatConstants.AFFECTED_USER
-        actual_heat = self.calculator._getHeatFromAffectedUsers()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Heat from users affected by duplicate bugs does not match "
-            "expected heat. Expected %s, got %s"
-            % (expected_heat, actual_heat))
-
-    def test__getHeatFromSubscribers(self):
-        # BugHeatCalculator._getHeatFromSubscribers() returns the bug
-        # heat generated by users subscribed tothe bug.
-        # By default, the heat will be BugHeatConstants.SUBSCRIBER,
-        # since there will be one direct subscriber (the user who filed
-        # the bug).
-        self.assertEqual(
-            BugHeatConstants.SUBSCRIBER,
-            self.calculator._getHeatFromSubscribers())
-
-        # As the number of subscribers increases, the heat generated
-        # will be n * BugHeatConstants.SUBSCRIBER, where n is the number
-        # of subscribers.
-        for i in range(5):
-            person = self.factory.makePerson()
-            self.bug.subscribe(person, person)
-
-        expected_heat = BugHeatConstants.SUBSCRIBER * 6
-        actual_heat = self.calculator._getHeatFromSubscribers()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Heat from subscribers does not match expected heat. "
-            "Expected %s, got %s" % (expected_heat, actual_heat))
-
-        # Subscribers from duplicates are included in the heat returned
-        # by _getHeatFromSubscribers()
-        dupe = self.factory.makeBug()
-        dupe.duplicateof = self.bug
-        expected_heat = BugHeatConstants.SUBSCRIBER * 7
-        actual_heat = self.calculator._getHeatFromSubscribers()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Heat from subscribers (including duplicate-subscribers) "
-            "does not match expected heat. Expected %s, got %s" %
-            (expected_heat, actual_heat))
-
-        # Seting the bug to private will increase its heat from
-        # subscribers by 1 * BugHeatConstants.SUBSCRIBER, as the project
-        # owner will now be directly subscribed to it.
-        self.bug.setPrivate(True, self.bug.owner)
-        expected_heat = BugHeatConstants.SUBSCRIBER * 8
-        actual_heat = self.calculator._getHeatFromSubscribers()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Heat from subscribers to private bug does not match expected "
-            "heat. Expected %s, got %s" % (expected_heat, actual_heat))
-
-    def test__getHeatFromPrivacy(self):
-        # BugHeatCalculator._getHeatFromPrivacy() returns the heat
-        # generated by the bug's private attribute. If the bug is
-        # public, this will be 0.
-        self.assertEqual(0, self.calculator._getHeatFromPrivacy())
-
-        # However, if the bug is private, _getHeatFromPrivacy() will
-        # return BugHeatConstants.PRIVACY.
-        self.bug.setPrivate(True, self.bug.owner)
-        self.assertEqual(
-            BugHeatConstants.PRIVACY, self.calculator._getHeatFromPrivacy())
-
-    def test__getHeatFromSecurity(self):
-        # BugHeatCalculator._getHeatFromSecurity() returns the heat
-        # generated by the bug's security_related attribute. If the bug
-        # is not security related, _getHeatFromSecurity() will return 0.
-        self.assertEqual(0, self.calculator._getHeatFromPrivacy())
-
-
-        # If, on the other hand, the bug is security_related,
-        # _getHeatFromSecurity() will return BugHeatConstants.SECURITY
-        self.bug.setSecurityRelated(True)
-        self.assertEqual(
-            BugHeatConstants.SECURITY, self.calculator._getHeatFromSecurity())
-
-    def test_getBugHeat(self):
-        # BugHeatCalculator.getBugHeat() returns the total heat for a
-        # given bug as the sum of the results of all _getHeatFrom*()
-        # methods.
-        # By default this will be (BugHeatConstants.AFFECTED_USER +
-        # BugHeatConstants.SUBSCRIBER) since there will be one
-        # subscriber and one affected user only.
-        expected_heat = (
-            BugHeatConstants.AFFECTED_USER + BugHeatConstants.SUBSCRIBER)
-        actual_heat = self.calculator.getBugHeat()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Expected bug heat did not match actual bug heat. "
-            "Expected %s, got %s" % (expected_heat, actual_heat))
-
-        # Adding a duplicate and making the bug private and security
-        # related will increase its heat.
-        dupe = self.factory.makeBug()
-        dupe.duplicateof = self.bug
-        self.bug.setPrivate(True, self.bug.owner)
-        self.bug.setSecurityRelated(True)
-
-        expected_heat += (
-            BugHeatConstants.DUPLICATE +
-            BugHeatConstants.PRIVACY +
-            BugHeatConstants.SECURITY +
-            BugHeatConstants.AFFECTED_USER
-            )
-
-        # Adding the duplicate and making the bug private means it gets
-        # two new subscribers, the project owner and the duplicate's
-        # direct subscriber.
-        expected_heat += BugHeatConstants.SUBSCRIBER * 2
-        actual_heat = self.calculator.getBugHeat()
-        self.assertEqual(
-            expected_heat, actual_heat,
-            "Expected bug heat did not match actual bug heat. "
-            "Expected %s, got %s" % (expected_heat, actual_heat))
-
-    def test_getBugHeat_complete_bugs(self):
-        # Bug which are in a resolved status don't have heat at all.
-        complete_bug = self.factory.makeBug()
-        heat = BugHeatCalculator(complete_bug).getBugHeat()
-        self.assertNotEqual(
-            0, heat,
-            "Expected bug heat did not match actual bug heat. "
-            "Expected a positive value, got 0")
-        complete_bug.bugtasks[0].transitionToStatus(
-            BugTaskStatus.INVALID, complete_bug.owner)
-        heat = BugHeatCalculator(complete_bug).getBugHeat()
-        self.assertEqual(
-            0, heat,
-            "Expected bug heat did not match actual bug heat. "
-            "Expected %s, got %s" % (0, heat))
-
-    def test_getBugHeat_decay(self):
-        # Every day, a bug that wasn't touched has its heat reduced by 1%.
-        aging_bug = self.factory.makeBug()
-        fresh_heat = BugHeatCalculator(aging_bug).getBugHeat()
-        aging_bug.date_last_updated = (
-            aging_bug.date_last_updated - timedelta(days=1))
-        expected = int(fresh_heat * 0.99)
-        heat = BugHeatCalculator(aging_bug).getBugHeat()
-        self.assertEqual(
-            expected, heat,
-            "Expected bug heat did not match actual bug heat. "
-            "Expected %s, got %s" % (expected, heat))
-
-    def test_getBugHeat_activity(self):
-        # Bug heat increases by a quarter of the maximum bug heat divided by
-        # the number of days between the bug's creating and its last activity.
-        active_bug = removeSecurityProxy(self.factory.makeBug())
-        fresh_heat = BugHeatCalculator(active_bug).getBugHeat()
-        active_bug.date_last_updated = (
-            active_bug.date_last_updated - timedelta(days=10))
-        active_bug.datecreated = (active_bug.datecreated - timedelta(days=20))
-        active_bug.default_bugtask.target.setMaxBugHeat(100)
-        expected = int((fresh_heat * (0.99 ** 20)) + (100 * 0.25 / 20))
-        heat = BugHeatCalculator(active_bug).getBugHeat()
-        self.assertEqual(
-            expected, heat,
-            "Expected bug heat did not match actual bug heat. "
-            "Expected %s, got %s" % (expected, heat))
-
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2010-05-27 13:51:06 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2010-06-14 20:18:33 +0000
@@ -1435,7 +1435,7 @@
         status foo
     ...
     The 'status' command expects any of the following arguments:
-    new, incomplete, invalid, wontfix, expired, confirmed, triaged, inprogress, fixcommitted, fixreleased
+    new, incomplete, opinion, invalid, wontfix, expired, confirmed, triaged, inprogress, fixcommitted, fixreleased
     <BLANKLINE>
     For example:
     <BLANKLINE>

=== modified file 'lib/lp/bugs/tests/bugtarget-bugcount.txt'
--- lib/lp/bugs/tests/bugtarget-bugcount.txt	2010-04-15 13:26:33 +0000
+++ lib/lp/bugs/tests/bugtarget-bugcount.txt	2010-06-14 20:18:33 +0000
@@ -11,6 +11,7 @@
     ...     print status.name
     NEW
     INCOMPLETE
+    OPINION
     INVALID
     WONTFIX
     EXPIRED
@@ -54,6 +55,7 @@
     ...     print_count_difference(new_bug_counts, old_counts, status)
     NEW: 5 bug(s) more
     INCOMPLETE: 5 bug(s) more
+    OPINION: 5 bug(s) more
     INVALID: 5 bug(s) more
     WONTFIX: 5 bug(s) more
     EXPIRED: 5 bug(s) more

=== modified file 'lib/lp/bugs/tests/test_bugheat.py'
--- lib/lp/bugs/tests/test_bugheat.py	2010-05-27 13:56:03 +0000
+++ lib/lp/bugs/tests/test_bugheat.py	2010-06-14 20:18:33 +0000
@@ -5,114 +5,13 @@
 
 __metaclass__ = type
 
-import pytz
-import transaction
 import unittest
-from datetime import datetime
-
-from zope.component import getUtility
-
-from canonical.launchpad.scripts.tests import run_script
+
 from canonical.testing import LaunchpadZopelessLayer
 
-from lp.bugs.adapters.bugchange import BugDescriptionChange
-from lp.bugs.interfaces.bugjob import ICalculateBugHeatJobSource
-from lp.bugs.model.bugheat import CalculateBugHeatJob
-from lp.bugs.scripts.bugheat import BugHeatCalculator
-from lp.testing import TestCaseWithFactory
 from lp.testing.factory import LaunchpadObjectFactory
 
 
-class CalculateBugHeatJobTestCase(TestCaseWithFactory):
-    """Test case for CalculateBugHeatJob."""
-
-    layer = LaunchpadZopelessLayer
-
-    def setUp(self):
-        super(CalculateBugHeatJobTestCase, self).setUp()
-        self.bug = self.factory.makeBug()
-
-        # NB: This looks like it should go in the teardown, however
-        # creating the bug causes a job to be added for it. We clear
-        # this out so that our tests are consistent.
-        self._completeJobsAndAssertQueueEmpty()
-
-    def _completeJobsAndAssertQueueEmpty(self):
-        """Make sure that all the CalculateBugHeatJobs are completed."""
-        for bug_job in getUtility(ICalculateBugHeatJobSource).iterReady():
-            bug_job.job.start()
-            bug_job.job.complete()
-        self.assertEqual(0, self._getJobCount())
-
-    def _getJobCount(self):
-        """Return the number of CalculateBugHeatJobs in the queue."""
-        return len(self._getJobs())
-
-    def _getJobs(self):
-        """Return the pending CalculateBugHeatJobs as a list."""
-        return list(CalculateBugHeatJob.iterReady())
-
-    def test_run(self):
-        # CalculateBugHeatJob.run() sets calculates and sets the heat
-        # for a bug.
-        job = CalculateBugHeatJob.create(self.bug)
-        bug_heat_calculator = BugHeatCalculator(self.bug)
-
-        job.run()
-        self.assertEqual(
-            bug_heat_calculator.getBugHeat(), self.bug.heat)
-
-    def test_utility(self):
-        # CalculateBugHeatJobSource is a utility for acquiring
-        # CalculateBugHeatJobs.
-        utility = getUtility(ICalculateBugHeatJobSource)
-        self.assertTrue(
-            ICalculateBugHeatJobSource.providedBy(utility))
-
-    def test_create_only_creates_one(self):
-        # If there's already a CalculateBugHeatJob for a bug,
-        # CalculateBugHeatJob.create() won't create a new one.
-        job = CalculateBugHeatJob.create(self.bug)
-
-        # There will now be one job in the queue.
-        self.assertEqual(1, self._getJobCount())
-
-        new_job = CalculateBugHeatJob.create(self.bug)
-
-        # The two jobs will in fact be the same job.
-        self.assertEqual(job, new_job)
-
-        # And the queue will still have a length of 1.
-        self.assertEqual(1, self._getJobCount())
-
-    def test_cronscript_succeeds(self):
-        # The calculate-bug-heat cronscript will run all pending
-        # CalculateBugHeatJobs.
-        CalculateBugHeatJob.create(self.bug)
-        transaction.commit()
-
-        retcode, stdout, stderr = run_script(
-            'cronscripts/calculate-bug-heat.py', [],
-            expect_returncode=0)
-        self.assertEqual('', stdout)
-        self.assertIn(
-            'INFO    Ran 1 CalculateBugHeatJob jobs.\n', stderr)
-
-    def test_getOopsVars(self):
-        # BugJobDerived.getOopsVars() returns the variables to be used
-        # when logging an OOPS for a bug job. We test this using
-        # CalculateBugHeatJob because BugJobDerived doesn't let us
-        # create() jobs.
-        job = CalculateBugHeatJob.create(self.bug)
-        vars = job.getOopsVars()
-
-        # The Bug ID, BugJob ID and BugJob type will be returned by
-        # getOopsVars().
-        self.assertIn(('bug_id', self.bug.id), vars)
-        self.assertIn(('bug_job_id', job.context.id), vars)
-        self.assertIn(('bug_job_type', job.context.job_type.title), vars)
-
-
 class MaxHeatByTargetBase:
     """Base class for testing a bug target's max_bug_heat attribute."""
 

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-06-12 13:34:11 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-06-14 20:18:33 +0000
@@ -309,7 +309,10 @@
         'name',
         'description',
         'owner',
+        'build_daily'
         ])
+    daily_build_archive = Choice(vocabulary='TargetPPAs',
+        title=u'Daily build archive')
     distros = List(
         Choice(vocabulary='BuildableDistroSeries'),
         title=u'Default Distribution series')
@@ -318,10 +321,16 @@
         description=u'The text of the recipe.')
 
 
+
 class RecipeTextValidatorMixin:
     """Class to validate that the Source Package Recipe text is valid."""
 
     def validate(self, data):
+        if data['build_daily']:
+            if len(data['distros']) == 0:
+                self.setFieldError(
+                    'distros',
+                    'You must specify at least one series for daily builds.')
         try:
             parser = RecipeParser(data['recipe_text'])
             parser.parse()
@@ -343,7 +352,8 @@
     def initial_values(self):
         return {
             'recipe_text': MINIMAL_RECIPE_TEXT % self.context.bzr_identity,
-            'owner': self.user}
+            'owner': self.user,
+            'build_daily': False}
 
     @property
     def cancel_url(self):
@@ -357,7 +367,8 @@
             source_package_recipe = getUtility(
                 ISourcePackageRecipeSource).new(
                     self.user, self.user, data['name'], recipe,
-                    data['description'], data['distros'])
+                    data['description'], data['distros'],
+                    data['daily_build_archive'], data['build_daily'])
         except ForbiddenInstruction:
             # XXX: bug=592513 We shouldn't be hardcoding "run" here.
             self.setFieldError(

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-06-12 13:52:31 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-06-14 20:18:33 +0000
@@ -69,6 +69,14 @@
 
     layer = DatabaseFunctionalLayer
 
+    def makeBranch(self):
+        product = self.factory.makeProduct(
+            name='ratatouille', displayname='Ratatouille')
+        branch = self.factory.makeBranch(
+            owner=self.chef, product=product, name='veggies')
+        self.factory.makeSourcePackage(sourcepackagename='ratatouille')
+        return branch
+
     def test_create_new_recipe_not_logged_in(self):
         from canonical.launchpad.testing.pages import setupBrowser
         product = self.factory.makeProduct(
@@ -85,11 +93,7 @@
             Unauthorized, browser.getLink('Create packaging recipe').click)
 
     def test_create_new_recipe(self):
-        product = self.factory.makeProduct(
-            name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
-
+        branch = self.makeBranch()
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
         browser.getLink('Create packaging recipe').click()
@@ -97,6 +101,7 @@
         browser.getControl(name='field.name').value = 'daily'
         browser.getControl('Description').value = 'Make some food!'
         browser.getControl('Secret Squirrel').click()
+        browser.getControl('Build daily').click()
         browser.getControl('Create Recipe').click()
 
         pattern = """\
@@ -107,9 +112,11 @@
             Make some food!
 
             Recipe information
+            Build daily: True
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/veggies
             Debian version: 1.0
+            Daily build archive: Secret PPA
             Distribution series: Secret Squirrel
             .*
 
@@ -168,10 +175,7 @@
     def test_create_recipe_bad_text(self):
         # If a user tries to create source package recipe with bad text, they
         # should get an error.
-        product = self.factory.makeProduct(
-            name='ratatouille', displayname='Ratatouille')
-        branch = self.factory.makeBranch(
-            owner=self.chef, product=product, name='veggies')
+        branch = self.makeBranch()
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
@@ -186,6 +190,17 @@
             extract_text(find_tags_by_class(browser.contents, 'message')[1]),
             'The recipe text is not a valid bzr-builder recipe.')
 
+    def test_create_recipe_no_distroseries(self):
+        browser = self.getViewBrowser(self.makeBranch(), '+new-recipe')
+        browser.getControl(name='field.name').value = 'daily'
+        browser.getControl('Description').value = 'Make some food!'
+
+        browser.getControl('Build daily').click()
+        browser.getControl('Create Recipe').click()
+        self.assertEqual(
+            extract_text(find_tags_by_class(browser.contents, 'message')[1]),
+            'You must specify at least one series for daily builds.')
+
     def test_create_dupe_recipe(self):
         # You shouldn't be able to create a duplicate recipe owned by the same
         # person with the same name.
@@ -228,7 +243,11 @@
         recipe = self.factory.makeSourcePackageRecipe(
             owner=self.chef, registrant=self.chef,
             name=u'things', description=u'This is a recipe',
-            distroseries=self.squirrel, branches=[veggie_branch])
+            distroseries=self.squirrel, branches=[veggie_branch],
+            daily_build_archive=self.ppa)
+        self.factory.makeArchive(
+            distribution=self.ppa.distribution, name='ppa2',
+            displayname="PPA 2", owner=self.chef)
 
         meat_path = meat_branch.bzr_identity
 
@@ -240,6 +259,7 @@
             MINIMAL_RECIPE_TEXT % meat_path)
         browser.getControl('Secret Squirrel').click()
         browser.getControl('Mumbly Midget').click()
+        browser.getControl('PPA 2').click()
         browser.getControl('Update Recipe').click()
 
         pattern = """\
@@ -250,9 +270,12 @@
             This is stuff
 
             Recipe information
+            Build daily: False
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/meat
             Debian version: 1.0
+            Daily build archive:
+            PPA 2
             Distribution series: Mumbly Midget
             .*
 
@@ -357,9 +380,13 @@
             This is stuff
 
             Recipe information
+            Build daily:
+            False
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/meat
             Debian version: 1.0
+            Daily build archive:
+            Secret PPA
             Distribution series: Mumbly Midget
             .*
 
@@ -389,9 +416,11 @@
             This recipe .*changes.
 
             Recipe information
+            Build daily: False
             Owner: Master Chef
             Base branch: lp://dev/~chef/chocolate/cake
             Debian version: 1.0
+            Daily build archive: Secret PPA
             Distribution series: Secret Squirrel
 
             Build records

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-06-10 07:55:54 +0000
+++ lib/lp/code/configure.zcml	2010-06-14 20:18:33 +0000
@@ -1052,6 +1052,7 @@
        set_attributes="
            build_daily
            builder_recipe
+           daily_build_archive
            date_last_modified
            description
            distroseries

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-06-11 05:05:52 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-06-14 20:18:33 +0000
@@ -95,7 +95,7 @@
             " build a source package for"),
         readonly=False)
     build_daily = Bool(
-        title=_("If true, the recipe should be built daily."))
+        title=_("Build daily"))
 
     name = exported(TextLine(
             title=_("Name"), required=True,

=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
--- lib/lp/code/templates/sourcepackagerecipe-index.pt	2010-04-28 21:18:13 +0000
+++ lib/lp/code/templates/sourcepackagerecipe-index.pt	2010-06-14 20:18:33 +0000
@@ -36,6 +36,11 @@
       <div class="portlet">
         <h2>Recipe information</h2>
         <div class="two-column-list">
+          <dl id="build_daily">
+            <dt>Build daily:</dt>
+            <dd tal:content="context/build_daily" />
+          </dl>
+
           <dl id="owner">
             <dt>Owner:</dt>
             <dd tal:content="structure context/owner/fmt:link" />
@@ -48,6 +53,14 @@
             <dt>Debian version:</dt>
             <dd tal:content="context/deb_version_template" />
           </dl>
+          <dl id="daily_build_archive">
+            <dt>Daily build archive:</dt>
+            <dd tal:content="structure context/daily_build_archive/fmt:link"
+                tal:condition="context/daily_build_archive">
+            </dd>
+            <dd tal:condition="not: context/daily_build_archive">None</dd>
+          </dl>
+
           <dl id="distros">
             <dt>Distribution series:</dt>
             <dd>

=== modified file 'utilities/report-database-stats.py'
--- utilities/report-database-stats.py	2010-04-29 12:38:05 +0000
+++ utilities/report-database-stats.py	2010-06-14 20:18:33 +0000
@@ -72,12 +72,22 @@
 
 
 def get_cpu_stats(cur, options):
+    # This query calculates the averate cpu utilization from the
+    # samples. It assumes samples are taken at regular intervals over
+    # the period.
     query = """
-        SELECT avg(cpu), username FROM DatabaseCpuStats
+        SELECT (
+            CAST(SUM(cpu) AS float) / (
+                SELECT COUNT(DISTINCT date_created) FROM DatabaseCpuStats
+                WHERE
+                    date_created >= (CURRENT_TIMESTAMP AT TIME ZONE 'UTC')
+                    - CAST (%s AS interval))
+            ) AS avg_cpu, username
+        FROM DatabaseCpuStats
         WHERE date_created >= (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'
             - CAST(%s AS interval))
         GROUP BY username
-        """ % sqlvalues(options.since_interval)
+        """ % sqlvalues(options.since_interval, options.since_interval)
 
     cur.execute(query)
 
@@ -107,16 +117,20 @@
     tables = get_table_stats(cur, options)
     arbitrary_table = list(tables)[0]
     interval = arbitrary_table.date_end - arbitrary_table.date_start
-    per_minute = interval.days * 24 * 60 + interval.seconds / 60.0
+    per_second = float(interval.days * 24 * 60 * 60 + interval.seconds)
 
     print "== Most Read Tables =="
     print
+    # These match the pg_user_table_stats view. schemaname is the
+    # namespace (normally 'public'), relname is the table (relation)
+    # name. total_tup_red is the total number of rows read.
+    # idx_tup_fetch is the number of rows looked up using an index.
     tables_sort = ['total_tup_read', 'idx_tup_fetch', 'schemaname', 'relname']
     most_read_tables = sorted(
         tables, key=attrgetter(*tables_sort), reverse=True)
     for table in most_read_tables[:options.limit]:
-        print "%40s || %10.2f tuples/min" % (
-            table.relname, table.total_tup_read / per_minute)
+        print "%40s || %10.2f tuples/sec" % (
+            table.relname, table.total_tup_read / per_second)
     print
 
     print "== Most Written Tables =="
@@ -126,15 +140,15 @@
     most_written_tables = sorted(
         tables, key=attrgetter(*tables_sort), reverse=True)
     for table in most_written_tables[:options.limit]:
-        print "%40s || %10.2f tuples/min" % (
-            table.relname, table.total_tup_written / per_minute)
+        print "%40s || %10.2f tuples/sec" % (
+            table.relname, table.total_tup_written / per_second)
     print
 
     user_cpu = get_cpu_stats(cur, options)
     print "== Most Active Users =="
     print
     for cpu, username in sorted(user_cpu, reverse=True)[:options.limit]:
-        print "%40s || %6.2f%% CPU" % (username, float(cpu) / 100)
+        print "%40s || %10.2f%% CPU" % (username, float(cpu) / 10)
 
 
 if __name__ == '__main__':