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

Proposed by Luke Faraone on 2016-04-29
Status: Needs review
Proposed branch: lp:~lfaraone/ubuntu-cdimage/no-img
Merge into: lp:ubuntu-cdimage
Diff against target: 17 lines (+1/-6)
1 file modified
lib/cdimage/tree.py (+1/-6)
To merge this branch: bzr merge lp:~lfaraone/ubuntu-cdimage/no-img
Reviewer Review Type Date Requested Status
Colin Watson 2016-04-30 Pending
Adam Conrad 2016-04-29 Pending
Review via email: mp+293342@code.launchpad.net

Description of the change

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

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

To post a comment you must log in.

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/cdimage/tree.py'
2--- lib/cdimage/tree.py 2016-04-21 11:44:10 +0000
3+++ lib/cdimage/tree.py 2016-04-29 04:26:17 +0000
4@@ -1515,12 +1515,7 @@
5 img_link = Link(
6 "https://wiki.ubuntu.com/MobileTeam/Mobile/HowTo/ImageWriting",
7 "USB Image Writing Guide")
8- if got_iso and got_img:
9- print(
10- "<p>If you need help burning these images to disk, see "
11- "the %s or the %s.</p>" % (iso_link, img_link),
12- file=header)
13- elif got_iso:
14+ if got_iso:
15 print(
16 "<p>If you need help burning these images to disk, see "
17 "the %s.</p>" % iso_link, file=header)

Subscribers

People subscribed via source and target branches