Merge lp:~edwin-grubbs/launchpad/bug-597738-bug-service-status into lp:launchpad

[Edwin Grubbs]

Summary
-------

This branch provides the user with more information about filing bugs on
the bugs.launchpad.net/$project page. This branch also takes advantage
of the new bug_tracking_usage attribute that returns an enum as opposed
to the old official_malone boolean. If the project is not using
Launchpad as the bug tracker, the page will also inform the user of any
ubuntu packages linked to the project under which bugs can be filed.

This branch is dependent on
lp:~jcsackett/launchpad/deprecate-official_codehosting

Implementation details
----------------------

lib/lp/answers/browser/questiontarget.py
lib/lp/answers/browser/tests/test_questiontarget.py
lib/lp/answers/templates/unknown-support.pt
lib/lp/bugs/browser/bugtarget.py
lib/lp/bugs/stories/bugs/xx-front-page-info.txt
lib/lp/bugs/templates/bugtarget-bugs.pt
lib/lp/registry/doc/product.txt
lib/lp/registry/interfaces/product.py
lib/lp/registry/model/product.py

Tests
-----

./bin/test -vv -t 'xx-front-page-info.txt|doc/product.txt'

Demo and Q/A
------------

* Open http://launchpad.dev/firefox/+configure-bugtracker
  * Switch the "Bugs are tracked" field between the values.
* Open http://bugs.launchpad.dev/firefox
  * If bugs are tracked in launchpad, a bug table should be shown.
  * If bugs are tracked externally, the page should contain:
      <meta name="robots" content="noindex,nofollow"/>
      <strong>Bugs are tracked in _SOME BUGTRACKER_.</strong>

      <a>Getting started with bug tracking in Launchpad.</a>
      Firefox bug reports are also tracked in <a>mozilla-firefox in Ubuntu</a>.

  * If launchpad doesn't know where bugs are tracked, it should contain:
      <meta name="robots" content="noindex,nofollow"/>
      <strong>
      Launchpad does not know where to forward bug reports to contact the*
      developers of Mozilla Firefox.
      </strong>

      <a>Getting started with bug tracking in Launchpad.</a>
      Firefox bug reports are tracked in <a>mozilla-firefox in Ubuntu</a>.

[Jelmer Vernooij (jelmer)]

The text "Mozilla Firefox bug reports are tracked in: mozilla-firefox in ubuntu, mozilla-firefox in ubuntu." is a bit confusing. The text is repeated, but I would also argue that the text should mention somehow that those places are not for the bugs for upstream Firefox.

Perhaps something like: "Launchpad keeps track of bug reports for <a>mozilla-firefox in Ubuntu</a>."

review: Needs Fixing (code)

[Edwin Grubbs (edwin-grubbs)]

> The text "Mozilla Firefox bug reports are tracked in: mozilla-firefox in
> ubuntu, mozilla-firefox in ubuntu." is a bit confusing. The text is repeated,
> but I would also argue that the text should mention somehow that those places
> are not for the bugs for upstream Firefox.
>
> Perhaps something like: "Launchpad keeps track of bug reports for <a>mozilla-
> firefox in Ubuntu</a>."

Hi Jelmer,

Thanks for the review. I've made the wording changes you suggested, and I resolved the merge conflict with devel. When I removed the code that made the results distinct on the distro, I didn't realize that what was really necessary was to make it distinct on the distro/sourcepackagename. I did that, so now you won't see the odd duplicates on that page. I also added some testing for that text.

-Edwin

[Jelmer Vernooij (jelmer)]

review: Approve (code)

[Deryck Hodge (deryck)]

Since I'm not a UI reviewer, I'll abstain from review; however, as a bugs guy looking at the change, I'm not sure the language is quite right for the case where we don't know where bugs are tracked. Saying Launchpad "does not know where to forward bug reports" assumes the project doesn't host itself on Launchpad. I think it would read better as Launchpad "does not know where $project tracks its bugs." Or something like that.

Just my .02c. :-) Nice work, otherwise.

Cheers,
deryck

review: Abstain (ui)

[Henning Eggers (henninge)]

Hi Edwin!
Thanks for adding these helpful comments. I think the help link is very important. Although you don't mention it it looks like you did the same for answers. Generally this looks good to me although I have a few small comments.

"Launchpad does not know where to forward bug reports to contact the developers of Mozilla Firefox."
That sentence seems to either be missing a "to" or I am misunderstanding it. Maybe it should simply be "Launchpad does not know where to forward bug reports to." or even just "Bugs are not tracked in Launchpad". The latter is consistent with "Bugs are tracked in The Mozilla.org Bug Tracker."

I wonder if the next line should be prefixed with "Hint: Launchpad keeps track of ..." to make clear it's a hint and not contradicting the previous line. The same line on the answers page should be worded similarly.

Actually, I think these wording questions are Matt Revell's domain .... ;-)

OK, here is the real UI issue I have:
"Launchpad allows your project to track questions and create FAQs." sits right on top the helpful links. There should at least be some padding in between those but really I think that line should go away completely. It can be integrated in the help link, e.g. "Getting started with offering support for your project." which explains a bit more what this is about.

With that last change in place, I can approve the UI here. That's it. ;-)

Henning

review: Approve (ui*)

[Edwin Grubbs (edwin-grubbs)]

> Hi Edwin!
> Thanks for adding these helpful comments. I think the help link is very
> important. Although you don't mention it it looks like you did the same for
> answers. Generally this looks good to me although I have a few small comments.
>
> "Launchpad does not know where to forward bug reports to contact the
> developers of Mozilla Firefox."
> That sentence seems to either be missing a "to" or I am misunderstanding it.
> Maybe it should simply be "Launchpad does not know where to forward bug
> reports to." or even just "Bugs are not tracked in Launchpad". The latter is
> consistent with "Bugs are tracked in The Mozilla.org Bug Tracker."

The reason for the wordiness is that I'm trying to explain to the user the difference between reporting a bug on ubuntu's firefox package and reporting a bug to the actual developers, since this page will suggest reporting a bug on the package if the project doesn't use Launchpad as their bug tracker. I want to avoid saying "Bugs are not tracked in Launchpad. You can submit a bug for the firefox package." since that sounds contradictory.

How does this sound? "Mozilla Firefox must be configured in order for Launchpad to forward bugs to the project's developers."

> I wonder if the next line should be prefixed with "Hint: Launchpad keeps track
> of ..." to make clear it's a hint and not contradicting the previous line. The
> same line on the answers page should be worded similarly.
>
> Actually, I think these wording questions are Matt Revell's domain .... ;-)
>
> OK, here is the real UI issue I have:
> "Launchpad allows your project to track questions and create FAQs." sits right
> on top the helpful links. There should at least be some padding in between
> those but really I think that line should go away completely. It can be
> integrated in the help link, e.g. "Getting started with offering support for
> your project." which explains a bit more what this is about.

I think that getting rid of the text looks cleaner than integrating it with the help link, but I don't know how important it is to explain that "offering support" means tracking questions and creating FAQs.

I'll let the secondary UI reviewer weigh in before I change the branch.

> With that last change in place, I can approve the UI here. That's it. ;-)
>
> Henning

[Curtis Hovey (sinzui)]

Hi Edwin, et al.

I have some concerns about the consistency of the unknown/external/lp
states for all bug targets and some of their states. I think we need to
address all of these and I think we need to plan one or more branches to
complete the bugs app front page for bugtargets

(distro) https://bugs.launchpad.dev/kubuntu as Admin

    I see a message about forwarding bugs, but I know distros cannot
    have remote bug trackers. The choice is Launchpad or does not use
    Launchpad. The current message is better

    This is a fair example of why we do not use context/title inline.

    I see "_Enable bug tracking._" I think there should be an edit icon
    preceding it.

(dsp) https://bugs.launchpad.dev/kubuntu/+source/mozilla-firefox

    Oh my! This implies kubuntu does use bugs. I get an oops if I try to
    report bug.
    /me looks at fedora on lpnet.
    https://bugs.edge.launchpad.net/fedora/+source/mozilla-firefox
    also prompts me to report a bug and it too oopses :(
    ^ This is a separate issue but this is exactly the kind of
      mis-communication we are trying to fix. bridging the grape is not
      done until we address this.
      https://bugs.edge.launchpad.net/malone/+bug/635302

(project) https://bugs.launchpad.dev/gnome-terminal with bug tracker

    Looks good.

(project) https://bugs.launchpad.dev/thunderbird after linking to two packages

    I see
        Launchpad keeps track of bug reports for _cnews in ubuntu_,
        _pmount in ubuntu_.
    which is very odd. Some projects produce 20 packages and some have
    names nothing like the upstream project in Lp. I am not sure Launchpad
    is tracking this bugs, Ubuntu is. Maybe
        Ubuntu tracks bugs related to packages derived from this project:
        _cnews in ubuntu_, _pmount in ubuntu_.

(project group) https://bugs.launchpad.dev/launchpad-mirrors

    Implies the project groups has projects that track bugs. This is not
    True. The page should state that none of the group's project use
    Launchpad to track bugs. There is nothing to configure since the behaviour
    is derived from the state of member projects. The answers app tells the
    user that Lp does not know where support is managed.

> === modified file 'lib/lp/bugs/templates/bugtarget-bugs.pt'
> --- lib/lp/bugs/templates/bugtarget-bugs.pt 2010-08-04 11:01:15 +0000
> +++ lib/lp/bugs/templates/bugtarget-bugs.pt 2010-09-10 14:33:54 +0000
> ...
>
> @@ -162,27 +166,55 @@
>
> <p id="no-bugs-report"><a href="+filebug">Report a bug.</a></p>
> </tal:no_hot_bugs>
> - </tal:uses_malone>
> -
> - <tal:not_uses_malone condition="not: view/uses_launchpad_bugtracker"
> - tal:define ="configure_bugtracker context/menu:overview/configure_bugtracker | nothing">
> - <p id="no-malone"><strong><tal:project_title replace="context/title" /> does not use Launchpad for
> - bug tracking.</strong></p>
> - <p tal:condition="view/external_bugtracker"
> - id="bugtracker"><strong>Bugs are tracked in
> - <tal:bugtracker replace="structure view/bugtracker" />.</strong>
> - </p>
> -
> - <p tal:condition="context/required:launchpad.Edi...

review: Needs Information (ui)

[Curtis Hovey (sinzui)]

> > Hi Edwin!
> > Thanks for adding these helpful comments. I think the help link is very
> > important. Although you don't mention it it looks like you did the same for
> > answers. Generally this looks good to me although I have a few small
> comments.
> >
> > "Launchpad does not know where to forward bug reports to contact the
> > developers of Mozilla Firefox."
> > That sentence seems to either be missing a "to" or I am misunderstanding
> it.
> > Maybe it should simply be "Launchpad does not know where to forward bug
> > reports to." or even just "Bugs are not tracked in Launchpad". The latter is
> > consistent with "Bugs are tracked in The Mozilla.org Bug Tracker."
>
>
> The reason for the wordiness is that I'm trying to explain to the user the
> difference between reporting a bug on ubuntu's firefox package and reporting a
> bug to the actual developers, since this page will suggest reporting a bug on
> the package if the project doesn't use Launchpad as their bug tracker. I want
> to avoid saying "Bugs are not tracked in Launchpad. You can submit a bug for
> the firefox package." since that sounds contradictory.
>
> How does this sound? "Mozilla Firefox must be configured in order for
> Launchpad to forward bugs to the project's developers."

I think this text is fine. I think part of the problem is really about the Ubuntu case. Ubuntu is not tracking project bugs, it is tracking package bugs:

Ubuntu tracks bugs related to packages derived from this project:
        _cnews in ubuntu_, _pmount in ubuntu_.

...

> > integrated in the help link, e.g. "Getting started with offering support for
> > your project." which explains a bit more what this is about.
>
>
> I think that getting rid of the text looks cleaner than integrating it with
> the help link, but I don't know how important it is to explain that "offering
> support" means tracking questions and creating FAQs.

Instead of support, maybe we should just say "questions and FAQs", because that is what we want to know. I will be adding fields for mailing lists and forums for answers in my after hours, so I expect the external page will clearly state where the user can find the answers to his or her questions.

[Edwin Grubbs (edwin-grubbs)]

> Hi Edwin, et al.
>
> I have some concerns about the consistency of the unknown/external/lp
> states for all bug targets and some of their states. I think we need to
> address all of these and I think we need to plan one or more branches to
> complete the bugs app front page for bugtargets
>
> (distro) https://bugs.launchpad.dev/kubuntu as Admin
>
> I see a message about forwarding bugs, but I know distros cannot
> have remote bug trackers. The choice is Launchpad or does not use
> Launchpad. The current message is better

I have added a conditional to display the old message if the context cannot have an external bug tracker.

> This is a fair example of why we do not use context/title inline.
>
> I see "_Enable bug tracking._" I think there should be an edit icon
> preceding it.

I have added the sprite to this link.

> (dsp) https://bugs.launchpad.dev/kubuntu/+source/mozilla-firefox
>
> Oh my! This implies kubuntu does use bugs. I get an oops if I try to
> report bug.
> /me looks at fedora on lpnet.
> https://bugs.edge.launchpad.net/fedora/+source/mozilla-firefox
> also prompts me to report a bug and it too oopses :(
> ^ This is a separate issue but this is exactly the kind of
> mis-communication we are trying to fix. bridging the grape is not
> done until we address this.
> https://bugs.edge.launchpad.net/malone/+bug/635302

The DSP's default view is +bugs instead of +bugs-index, so it has no logic to inform the user that Launchpad doesn't track bugs for the DSP.

> (project) https://bugs.launchpad.dev/gnome-terminal with bug tracker
>
> Looks good.
>
> (project) https://bugs.launchpad.dev/thunderbird after linking to two packages
>
> I see
> Launchpad keeps track of bug reports for _cnews in ubuntu_,
> _pmount in ubuntu_.
> which is very odd. Some projects produce 20 packages and some have
> names nothing like the upstream project in Lp. I am not sure Launchpad
> is tracking this bugs, Ubuntu is. Maybe
> Ubuntu tracks bugs related to packages derived from this project:
> _cnews in ubuntu_, _pmount in ubuntu_.

I have made that change to the wording.

> (project group) https://bugs.launchpad.dev/launchpad-mirrors
>
> Implies the project groups has projects that track bugs. This is not
> True. The page should state that none of the group's project use
> Launchpad to track bugs. There is nothing to configure since the behaviour
> is derived from the state of member projects. The answers app tells the
> user that Lp does not know where support is managed.

Just like DSPs, ProjectGroups use +bugs instead of +bugs-index, so it will take some work in a later branch to fix.

> > === modified file 'lib/lp/bugs/templates/bugtarget-bugs.pt'
> > --- lib/lp/bugs/templates/bugtarget-bugs.pt 2010-08-04 11:01:15 +0000
> > +++ lib/lp/bugs/templates/bugtarget-bugs.pt 2010-09-10 14:33:54 +0000
> > ...
> >
> > @@ -162,27 +166,55 @@
> >
> > <p id="no-bugs-report"><a href="+filebug">Report a bug.</a></p>
> > </tal:no_hot_bugs>
> > - </tal:uses_malone>
> > -
> > - <tal:not_uses_...

[Curtis Hovey (sinzui)]

Thanks for examining these issue and explaining what is happening. I think your branch is fine to land. We can discuss next steps in a separate thread. The series.title is an interesting issue because the attr is in the process of being removed from distroseries as a part of the Derivative distro work.

review: Approve (ui)

=== modified file 'lib/lp/answers/browser/questiontarget.py'
--- lib/lp/answers/browser/questiontarget.py	2010-09-03 13:32:42 +0000
+++ lib/lp/answers/browser/questiontarget.py	2010-09-14 13:29:47 +0000
@@ -507,22 +507,6 @@
                 question.sourcepackagename.name)
 
     @property
-    def ubuntu_packages(self):
-        """The Ubuntu `IDistributionSourcePackage`s linked to the context.
-
-        If the context is an `IProduct` and it has `IPackaging` links to
-        Ubuntu, a list is returned. Otherwise None is returned
-        """
-        if IProduct.providedBy(self.context):
-            ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
-            packages = [
-                package for package in self.context.distrosourcepackages
-                if package.distribution == ubuntu]
-            if len(packages) > 0:
-                return packages
-        return None
-
-    @property
     def can_configure_answers(self):
         """Can the user configure answers for the `IQuestionTarget`."""
         target = self.context

=== modified file 'lib/lp/answers/browser/tests/test_questiontarget.py'
--- lib/lp/answers/browser/tests/test_questiontarget.py	2010-09-06 09:11:43 +0000
+++ lib/lp/answers/browser/tests/test_questiontarget.py	2010-09-14 13:29:47 +0000
@@ -135,30 +135,6 @@
         self.assertViewTemplate(question_set, 'question-listing.pt')
 
 
-class TestSearchQuestionsView_ubuntu_packages(TestSearchQuestionsView):
-    """Test the behaviour of SearchQuestionsView.ubuntu_packages."""
-
-    def test_nonproduct_ubuntu_packages(self):
-        distribution = self.factory.makeDistribution()
-        view = create_initialized_view(distribution, '+questions')
-        packages = view.ubuntu_packages
-        self.assertEqual(None, packages)
-
-    def test_product_ubuntu_packages_unlinked(self):
-        product = self.factory.makeProduct()
-        view = create_initialized_view(product, '+questions')
-        packages = view.ubuntu_packages
-        self.assertEqual(None, packages)
-
-    def test_product_ubuntu_packages_linked(self):
-        product = self.factory.makeProduct()
-        self.linkPackage(product, 'cow')
-        view = create_initialized_view(product, '+questions')
-        packages = view.ubuntu_packages
-        self.assertEqual(1, len(packages))
-        self.assertEqual('cow', packages[0].name)
-
-
 class TestSearchQuestionsViewUnknown(TestSearchQuestionsView):
     """Test the behaviour of SearchQuestionsView unknown support."""
 

=== modified file 'lib/lp/answers/templates/unknown-support.pt'
--- lib/lp/answers/templates/unknown-support.pt	2010-08-05 17:14:05 +0000
+++ lib/lp/answers/templates/unknown-support.pt	2010-09-14 13:29:47 +0000
@@ -21,9 +21,9 @@
         </p>
 
         <p id="ubuntu-support"
-          tal:define="packages view/ubuntu_packages"
+          tal:define="packages context/ubuntu_packages | nothing"
           tal:condition="packages">
-          <tal:project replace="context/displayname" /> questions are also
+          <tal:project replace="context/displayname" /> questions are
           tracked in: <tal:packages repeat="package packages">
             <tal:package replace="structure package/fmt:link" /><tal:comma
             condition="not:repeat/package/end">, </tal:comma></tal:packages>.
@@ -31,10 +31,9 @@
 
         <p id="configure-support"
           tal:condition="view/can_configure_answers">
-          Launchpad allows your project to track questions and create FAQs.
-          <br /><a class="sprite maybe"
+          <a class="sprite maybe"
             href="https://help.launchpad.net/Answers">Getting started
-          with support tracking in Launchpad</a>.
+          tracking questions and FAQs in Launchpad</a>.
           <br /><a tal:replace="structure context/menu:overview/configure_answers/fmt:link" />
         </p>
       </div>

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2010-09-03 03:12:39 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2010-09-14 13:29:47 +0000
@@ -1252,13 +1252,18 @@
             bug_statuses_to_show.append(BugTaskStatus.FIXRELEASED)
 
     @property
-    def uses_launchpad_bugtracker(self):
-        """Whether this distro or product tracks bugs in launchpad.
-
-        :returns: boolean
+    def can_have_external_bugtracker(self):
+        return (IProduct.providedBy(self.context)
+                or IProductSeries.providedBy(self.context))
+
+    @property
+    def bug_tracking_usage(self):
+        """Whether the context tracks bugs in launchpad.
+
+        :returns: ServiceUsage enum value
         """
         service_usage = IServiceUsage(self.context)
-        return service_usage.bug_tracking_usage == ServiceUsage.LAUNCHPAD
+        return service_usage.bug_tracking_usage
 
     @property
     def external_bugtracker(self):
@@ -1278,7 +1283,7 @@
 
         :returns: str which may contain HTML.
         """
-        if self.uses_launchpad_bugtracker:
+        if self.bug_tracking_usage == ServiceUsage.LAUNCHPAD:
             return 'Launchpad'
         elif self.external_bugtracker:
             return BugTrackerFormatterAPI(self.external_bugtracker).link(None)

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-09-03 03:12:39 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-09-14 13:29:47 +0000
@@ -159,6 +159,7 @@
 from lp.soyuz.model.publishing import SourcePackagePublishingHistory
 from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
 
+
 debbugsseveritymap = {
     None: BugTaskImportance.UNDECIDED,
     'wishlist': BugTaskImportance.WISHLIST,

=== modified file 'lib/lp/bugs/stories/bugs/xx-front-page-info.txt'
--- lib/lp/bugs/stories/bugs/xx-front-page-info.txt	2010-05-08 15:29:56 +0000
+++ lib/lp/bugs/stories/bugs/xx-front-page-info.txt	2010-09-14 13:29:47 +0000
@@ -19,7 +19,8 @@
     >>> anon_browser.open('http://bugs.launchpad.dev/test-project')
     >>> uses_malone_p = find_tag_by_id(anon_browser.contents, 'no-malone')
     >>> print extract_text(uses_malone_p)
-    Simple Test Project does not use Launchpad for bug tracking.
+    Test-project must be configured in order for Launchpad to forward bugs to
+    the project's developers.
 
 Only users who have permission to do so can enable bug tracking
 for a project.
@@ -53,7 +54,7 @@
     >>> bug_list = find_tag_by_id(
     ...     anon_browser.contents, 'no-bugs-filed')
     >>> print extract_text(bug_list)
-    There are currently no bugs filed against Project Uses Malone.
+    There are currently no bugs filed against Uses-malone.
 
 Since there are no bugs at all filed for the project, no search box is
 shown.
@@ -100,7 +101,7 @@
     >>> bug_list = find_tag_by_id(
     ...     anon_browser.contents, 'no-bugs-filed')
     >>> print extract_text(bug_list)
-    There are currently no open bugs filed against Project Uses Malone.
+    There are currently no open bugs filed against Uses-malone.
 
 But since the project has a bug, the search box is still visible.
 
@@ -112,8 +113,7 @@
     Advanced search
 
 Projects that use an external bug tracker will list the tracker on a
-bugs home page in addition to the message that the project does not
-use Launchpad for bug tracking.
+bugs home page.
 
     >>> login('[e-mail]')
     >>> some_tracker = factory.makeBugTracker(
@@ -121,9 +121,22 @@
     >>> test_project.bugtracker = some_tracker
     >>> logout()
     >>> anon_browser.open('http://bugs.launchpad.dev/test-project')
-    >>> uses_malone_p = find_tag_by_id(anon_browser.contents, 'no-malone')
-    >>> print extract_text(uses_malone_p)
-    Simple Test Project does not use Launchpad for bug tracking.
     >>> tracker_text = find_tag_by_id(anon_browser.contents, 'bugtracker')
     >>> print extract_text(tracker_text)
     Bugs are tracked in tracker.example.com/.
+
+Projects that are linked to an Ubuntu distro source package and that
+don't use Launchpad for bug tracking will inform the user that a bug can
+be reported on the project's source packages.
+
+    >>> login('[e-mail]')
+    >>> factory.makePackagingLink(
+    ...     productseries=test_project.development_focus,
+    ...     sourcepackagename='test-project-package',
+    ...     in_ubuntu=True)
+    >>> logout()
+    >>> anon_browser.open('http://bugs.launchpad.dev/test-project')
+    >>> print extract_text(
+    ...     find_tag_by_id(anon_browser.contents, 'also-in-ubuntu'))
+    Ubuntu also tracks bugs for packages derived from this project:
+    test-project-package in ubuntu.

=== modified file 'lib/lp/bugs/templates/bugtarget-bugs.pt'
--- lib/lp/bugs/templates/bugtarget-bugs.pt	2010-08-04 11:01:15 +0000
+++ lib/lp/bugs/templates/bugtarget-bugs.pt	2010-09-14 13:29:47 +0000
@@ -10,12 +10,15 @@
   i18n:domain="malone"
 >
   <metal:block fill-slot="head_epilogue">
+    <meta tal:condition="not: view/bug_tracking_usage/enumvalue:LAUNCHPAD"
+          name="robots" content="noindex,nofollow" />
     <style type="text/css">
       p#more-hot-bugs {float:right; margin-top:7px;}
     </style>
   </metal:block>
   <body>
-    <tal:side metal:fill-slot="side" condition="view/uses_launchpad_bugtracker">
+    <tal:side metal:fill-slot="side"
+              condition="view/bug_tracking_usage/enumvalue:LAUNCHPAD">
       <div id="involvement" class="portlet">
         <ul class="involvement">
           <li style="border: none">
@@ -95,7 +98,8 @@
 
 
 
-      <tal:uses_malone condition="view/uses_launchpad_bugtracker">
+      <tal:uses_launchpad_bugtracker
+        condition="view/bug_tracking_usage/enumvalue:LAUNCHPAD">
       <tal:has_bugtasks condition="context/has_bugtasks">
         <div class="search-box" style="margin-bottom:2em">
           <metal:search
@@ -158,31 +162,65 @@
       <tal:no_hot_bugs condition="not: view/hot_bugs_info/bugtasks">
         <p id="no-bugs-filed"><strong>There are currently no
           <span tal:condition="context/has_bugtasks">open</span> bugs filed
-          against <tal:project_title replace="context/title" />.</strong></p>
+          against <tal:displayname replace="context/displayname" />.</strong></p>
 
         <p id="no-bugs-report"><a href="+filebug">Report a bug.</a></p>
       </tal:no_hot_bugs>
-    </tal:uses_malone>
-
-    <tal:not_uses_malone condition="not: view/uses_launchpad_bugtracker"
-     tal:define ="configure_bugtracker context/menu:overview/configure_bugtracker | nothing">
-      <p id="no-malone"><strong><tal:project_title replace="context/title" /> does not use Launchpad for
-        bug tracking.</strong></p>
-          <p tal:condition="view/external_bugtracker"
-             id="bugtracker"><strong>Bugs are tracked in
-            <tal:bugtracker replace="structure view/bugtracker" />.</strong>
-          </p>
-
-        <p tal:condition="context/required:launchpad.Edit"
-           id="no-malone-edit"
-           >
-          <a tal:condition="configure_bugtracker"
-             tal:replace="structure configure_bugtracker/fmt:link"/>
-          <a tal:condition="not: configure_bugtracker"
-             tal:attributes="href string:${context/fmt:url/+edit}">
-            Enable bug tracking.</a>
-        </p>
-    </tal:not_uses_malone>
+    </tal:uses_launchpad_bugtracker>
+
+    <p id="no-malone"
+       tal:condition="view/bug_tracking_usage/enumvalue:UNKNOWN">
+      <strong tal:condition="view/can_have_external_bugtracker">
+        <tal:displayname replace="context/displayname" />
+        must be configured in order for Launchpad to forward bugs to
+        the project's developers.
+      </strong>
+      <strong tal:condition="not: view/can_have_external_bugtracker">
+        <tal:displayname replace="context/displayname" />
+        does not use Launchpad for bug tracking.
+      </strong>
+    </p>
+
+    <p tal:condition="view/external_bugtracker"
+       id="bugtracker">
+      <strong>Bugs are tracked in
+        <tal:bugtracker replace="structure view/bugtracker" />.
+      </strong>
+    </p>
+
+    <tal:also_in_ubuntu
+      condition="not: view/bug_tracking_usage/enumvalue:LAUNCHPAD">
+      <p tal:define="packages context/ubuntu_packages | nothing"
+         tal:condition="packages"
+         id="also-in-ubuntu">
+        Ubuntu
+        <tal:also condition="view/external_bugtracker">also</tal:also>
+        tracks bugs for packages derived from this project:
+        <tal:packages repeat="package packages">
+          <span style="white-space: nowrap"
+                tal:content="structure package/fmt:link" /><tal:comma
+          condition="not:repeat/package/end">,</tal:comma></tal:packages>.
+      </p>
+    </tal:also_in_ubuntu>
+
+    <div
+      tal:condition="not: view/bug_tracking_usage/enumvalue:LAUNCHPAD"
+      tal:define="configure_bugtracker context/menu:overview/configure_bugtracker | nothing">
+      <a class="sprite maybe"
+        href="https://help.launchpad.net/Bugs">Getting started
+      with bug tracking in Launchpad</a>.
+
+      <p tal:condition="context/required:launchpad.Edit"
+          id="no-malone-edit"
+          >
+        <a tal:condition="configure_bugtracker"
+          tal:replace="structure configure_bugtracker/fmt:link"/>
+        <a class="sprite edit"
+          tal:condition="not: configure_bugtracker"
+          tal:attributes="href string:${context/fmt:url/+edit}">
+          Enable bug tracking.</a>
+      </p>
+    </div>
 
     </div><!-- main -->
   </body>

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2010-09-09 18:21:55 +0000
+++ lib/lp/registry/browser/productseries.py	2010-09-14 13:29:47 +0000
@@ -280,12 +280,29 @@
     usedfor = IProductSeries
     facet = 'overview'
     links = [
-        'edit', 'delete', 'driver', 'link_branch', 'ubuntupkg',
-        'create_milestone', 'create_release', 'rdf', 'subscribe',
+        'configure_bugtracker',
+        'create_milestone',
+        'create_release',
+        'delete',
+        'driver',
+        'edit',
+        'link_branch',
+        'rdf',
         'set_branch',
+        'subscribe',
+        'ubuntupkg',
         ]
 
     @enabled_with_permission('launchpad.Edit')
+    def configure_bugtracker(self):
+        text = 'Configure bug tracker'
+        summary = 'Specify where bugs are tracked for this project'
+        return Link(
+            canonical_url(self.context.product,
+                          view_name='+configure-bugtracker'),
+            text, summary, icon='edit')
+
+    @enabled_with_permission('launchpad.Edit')
     def edit(self):
         """Return a link to edit this series."""
         text = 'Change details'

=== modified file 'lib/lp/registry/doc/product.txt'
--- lib/lp/registry/doc/product.txt	2010-09-10 13:29:42 +0000
+++ lib/lp/registry/doc/product.txt	2010-09-14 13:29:47 +0000
@@ -225,6 +225,11 @@
     >>> [(sp.name, sp.distribution.name) for sp in alsa.distrosourcepackages]
     [(u'alsa-utils', u'debian'), (u'alsa-utils', u'ubuntu')]
 
+For convenience, you can get just the distro source packages for Ubuntu.
+
+    >>> [(sp.name, sp.distribution.name) for sp in alsa.ubuntu_packages]
+    [(u'alsa-utils', u'ubuntu')]
+
 The date_next_suggest_packaging attribute records the date when Launchpad can
 resume suggesting Ubuntu packages that the project provides. A value of None
 means that no user has ever confirmed that that the project has no Ubuntu
@@ -714,6 +719,7 @@
     ...     print series.name
     trunk
 
+
 Changing ownership
 ==================
 

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2010-08-31 00:02:42 +0000
+++ lib/lp/registry/interfaces/product.py	2010-09-14 13:29:47 +0000
@@ -644,6 +644,9 @@
     distrosourcepackages = Attribute(_("List of distribution packages for "
         "this product"))
 
+    ubuntu_packages = Attribute(
+        _("List of distribution packages for this product in Ubuntu"))
+
     series = exported(
         doNotSnapshot(
             CollectionField(value_type=Object(schema=IProductSeries))))

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-09-03 11:05:21 +0000
+++ lib/lp/registry/model/product.py	2010-09-14 13:29:47 +0000
@@ -48,6 +48,9 @@
     SQLBase,
     sqlvalues,
     )
+from canonical.launchpad.components.decoratedresultset import (
+    DecoratedResultSet,
+    )
 from canonical.launchpad.interfaces.launchpad import (
     IHasIcon,
     IHasLogo,
@@ -64,6 +67,7 @@
     MAIN_STORE,
     )
 from canonical.launchpad.webapp.sorting import sorted_version_numbers
+
 from lp.answers.interfaces.faqtarget import IFAQTarget
 from lp.answers.interfaces.questioncollection import (
     QUESTION_STATUS_DEFAULT_SEARCH,
@@ -146,6 +150,7 @@
 from lp.registry.model.productlicense import ProductLicense
 from lp.registry.model.productrelease import ProductRelease
 from lp.registry.model.productseries import ProductSeries
+from lp.registry.model.sourcepackagename import SourcePackageName
 from lp.registry.model.structuralsubscription import (
     StructuralSubscriptionTargetMixin,
     )
@@ -829,28 +834,40 @@
             (x.sourcepackagename.name, x.distroseries.name,
              x.distroseries.distribution.name))
 
-    @property
+    @cachedproperty
     def distrosourcepackages(self):
-        from lp.registry.model.distributionsourcepackage \
-            import DistributionSourcePackage
-        clause = """ProductSeries.id=Packaging.productseries AND
-                    ProductSeries.product = %s
-                    """ % sqlvalues(self.id)
-        clauseTables = ['ProductSeries']
-        ret = Packaging.select(clause, clauseTables,
-            prejoins=["sourcepackagename", "distroseries.distribution"])
-        distros = set()
-        dsps = []
-        for packaging in ret:
-            distro = packaging.distroseries.distribution
-            if distro in distros:
-                continue
-            distros.add(distro)
-            dsps.append(DistributionSourcePackage(
-                sourcepackagename=packaging.sourcepackagename,
-                distribution=distro))
-        return sorted(dsps, key=lambda x:
-            (x.sourcepackagename.name, x.distribution.name))
+        from lp.registry.model.distributionsourcepackage import (
+            DistributionSourcePackage,
+            )
+        store = IStore(Packaging)
+        origin = [
+            Packaging,
+            Join(SourcePackageName,
+                 Packaging.sourcepackagename == SourcePackageName.id),
+            Join(ProductSeries, Packaging.productseries == ProductSeries.id),
+            Join(DistroSeries, Packaging.distroseries == DistroSeries.id),
+            Join(Distribution, DistroSeries.distribution == Distribution.id),
+            ]
+        result = store.using(*origin).find(
+            (SourcePackageName, Distribution),
+            ProductSeries.product == self)
+        result = result.order_by(SourcePackageName.name, Distribution.name)
+        result.config(distinct=True)
+
+        return [
+            DistributionSourcePackage(
+                sourcepackagename=sourcepackagename,
+                distribution=distro)
+            for sourcepackagename, distro in result]
+
+    @cachedproperty
+    def ubuntu_packages(self):
+        """The Ubuntu `IDistributionSourcePackage`s linked to the `IProduct`.
+        """
+        ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        return [
+            package for package in self.distrosourcepackages
+            if package.distribution == ubuntu]
 
     @property
     def bugtargetdisplayname(self):

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-09-09 20:12:02 +0000
+++ lib/lp/testing/factory.py	2010-09-14 13:29:47 +0000
@@ -182,6 +182,10 @@
 from lp.registry.interfaces.mailinglistsubscription import (
     MailingListAutoSubscribePolicy,
     )
+from lp.registry.interfaces.packaging import (
+    IPackagingUtil,
+    PackagingType,
+    )
 from lp.registry.interfaces.person import (
     IPerson,
     IPersonSet,
@@ -993,6 +997,29 @@
             removeSecurityProxy(branch).reviewer = reviewer
         return branch
 
+    def makePackagingLink(self, productseries=None, sourcepackagename=None,
+                          distroseries=None, packaging_type=None, owner=None,
+                          in_ubuntu=False):
+        if productseries is None:
+            productseries = self.makeProduct().development_focus
+        if sourcepackagename is None or isinstance(sourcepackagename, str):
+            sourcepackagename = self.makeSourcePackageName(sourcepackagename)
+        if distroseries is None:
+            distribution = None
+            if in_ubuntu:
+                distribution = getUtility(ILaunchpadCelebrities).ubuntu
+            distroseries = self.makeDistroSeries(distribution=distribution)
+        if packaging_type is None:
+            packaging_type = PackagingType.PRIME
+        if owner is None:
+            owner = self.makePerson()
+        return getUtility(IPackagingUtil).createPackaging(
+            productseries=productseries,
+            sourcepackagename=sourcepackagename,
+            distroseries=distroseries,
+            packaging=packaging_type,
+            owner=owner)
+
     def makePackageBranch(self, sourcepackage=None, distroseries=None,
                           sourcepackagename=None, **kwargs):
         """Make a package branch on an arbitrary package.

=== modified file 'lib/lp/testing/menu.py'
--- lib/lp/testing/menu.py	2010-09-12 11:43:36 +0000
+++ lib/lp/testing/menu.py	2010-09-14 13:29:47 +0000
@@ -11,7 +11,7 @@
 def check_menu_links(menu):
     context = menu.context
     for link in menu.iterlinks():
-        if link.target.startswith('/'):
+        if link.target.startswith(('/', 'http://')):
             # The context is not the context of this target.
             continue
         if '?' in link.target: