Merge lp:~lfaraone/ubuntu-cdimage/no-img into lp:ubuntu-cdimage

[Luke Faraone]

Remove mention of img files if both iso and img files are present.

We no longer create USB installation images for non-Touch releases.

[Steve Langasek (vorlon)]

For whatever reason this never got reviewed/merged when submitted 6 years ago. It looks like it still applies cleanly, but I haven't reasoned about whether it is appropriate to land so I'm not merging it. In practice the impact is negligible, as we have zero projects today where we are publishing both .img and .iso files together.

In the meantime, we are migrating ubuntu-cdimage from bzr to git so this will need to be resubmitted there if you think it is still important to land.

review: Needs Resubmitting

Unmerged revisions

1588. By Luke Faraone on 2016-04-29

Remove mention of img files if both iso and img files are present.

We no longer create USB installation images for non-Touch releases.

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2016-04-21 11:44:10 +0000
+++ lib/cdimage/tree.py	2016-04-29 04:26:17 +0000
@@ -1515,12 +1515,7 @@
             img_link = Link(
                 "https://wiki.ubuntu.com/MobileTeam/Mobile/HowTo/ImageWriting",
                 "USB Image Writing Guide")
-            if got_iso and got_img:
-                print(
-                    "<p>If you need help burning these images to disk, see "
-                    "the %s or the %s.</p>" % (iso_link, img_link),
-                    file=header)
-            elif got_iso:
+            if got_iso:
                 print(
                     "<p>If you need help burning these images to disk, see "
                     "the %s.</p>" % iso_link, file=header)