Merge lp:~cjwatson/launchpad/add-apt-repository-example into lp:launchpad

[Colin Watson]

Show explicit add-apt-repository command on Archive:+index.

Show explicit add-apt-repository command on Archive:+index. Pretty much everyone has a new enough add-apt-repository nowadays.

The tests for this are just in pagetests, ugh, but the pagetests in question are quite large and I didn't want to take the time to rewrite them.

[William Grant (wgrant)]

This won't work for a private PPA, but that workflow is already dodgy enough that this doesn't make it significantly worse.

review: Approve (code)

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2016-03-03 18:41:27 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2016-07-27 01:51:22 +0000
@@ -240,7 +240,7 @@
     >>> def publishToPPA(person_name, distroseries_name, name, version):
     ...     person = getUtility(IPersonSet).getByName(person_name)
     ...     distroseries = person.archive.distribution[distroseries_name]
-    ...     ign = factory.makeSourcePackagePublishingHistory(
+    ...     factory.makeSourcePackagePublishingHistory(
     ...         distroseries=distroseries, archive=person.archive,
     ...         sourcepackagename=name, version=version)
 
@@ -267,6 +267,8 @@
     You can update your system with unsupported packages from this
     untrusted PPA by adding ppa:cprov/ppa to your system's Software Sources.
     (Read about installing)
+    sudo add-apt-repository ppa:cprov/ppa
+    sudo apt-get update
     Technical details about this PPA
     ...
     For questions and bugs with software in this PPA please contact
@@ -395,7 +397,6 @@
 is also included in the statistics portlet.
 
     >>> from lp.buildmaster.enums import BuildStatus
-    >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.soyuz.interfaces.binarypackagebuild import (
     ...     IBinaryPackageBuildSet)
     >>> login('[e-mail]')

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2014-11-24 21:01:04 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2016-07-27 01:51:22 +0000
@@ -82,13 +82,6 @@
 
       <tal:is-active condition="archive_active">
 
-        <tal:comment replace="nothing">
-          XXX Michael Nelson 2010-02-25 bug=440512: Until we have
-          apt-add-repository backported, we can't simply state one
-          explicit solution here. Until then we just state a general
-          solution with the details in the linked help.
-        </tal:comment>
-
         <p>You can update your system with unsupported packages from
           this untrusted PPA by adding <strong
           tal:content="context/fmt:reference" class="ppa-reference">ppa:cprov/ppa</strong>
@@ -97,6 +90,11 @@
               target="help">Read about installing</a>)
         </p>
 
+        <pre class="command subordinate" tal:condition="not: context/private">
+sudo add-apt-repository <tal:reference tal:replace="context/fmt:reference" />
+sudo apt-get update
+        </pre>
+
         <div class="widget-header">
           Technical details about this PPA
         </div>