Wubi

Merge lp:~bcbc/wubi/precise-lp1067833 into lp:~ubuntu-installer/wubi/precise

  1. precise-lp1067833
  2. Merge into precise
Proposed by bcbc
Status: Merged
Merged at revision: 271
Proposed branch: lp:~bcbc/wubi/precise-lp1067833
Merge into: lp:~ubuntu-installer/wubi/precise
Diff against target: 93 lines (+16/-10)
2 files modified
data/isolist.ini (+10/-10)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~bcbc/wubi/precise-lp1067833
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+131805@code.launchpad.net

Description of the change

Fix metalink for Kubuntu/Xubuntu/Edubuntu/Mythbuntu. They currently link to 12.04 ISO metalinks which no longer exist. They should point to the 12.04.1 metalinks. Kubuntu still points to the releases.ubuntu.com website, so this fixes that as well.

To post a comment you must log in.
Revision history for this message
bcbc (bcbc) wrote :

I've tested the code for 64bit for Kubuntu/Edubuntu/Xubuntu/Mythbuntu to the point that it correctly downloads the metalink. (It was failing on this step before).

(Note that this won't fix Lubuntu 12.04.1 installs - the metalink is correct but the install fails for a different reason: bug 1043607)

Revision history for this message
Colin Watson (cjwatson) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/isolist.ini'
2--- data/isolist.ini 2012-08-16 14:29:09 +0000
3+++ data/isolist.ini 2012-10-29 00:06:21 +0000
4@@ -44,8 +44,8 @@
5 arch=i386
6 name=Kubuntu
7 packages=kubuntu-desktop
8-metalink=http://releases.ubuntu.com/kubuntu/12.04/kubuntu-12.04-desktop-i386.metalink
9-#metalink=http://releases.ubuntu.com/kubuntu/12.04/kubuntu-12.04-beta-desktop-i386.metalink
10+metalink=http://cdimage.ubuntu.com/kubuntu/releases/12.04/release/kubuntu-12.04.1-desktop-i386.metalink
11+#metalink=http://cdimage.ubuntu.com/kubuntu/releases/12.04/release/kubuntu-12.04-beta-desktop-i386.metalink
12 metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/precise-desktop-i386.metalink
13 website=http://www.kubuntu.org
14 ordering=3
15@@ -54,8 +54,8 @@
16 arch=amd64
17 name=Kubuntu
18 packages=kubuntu-desktop
19-metalink=http://releases.ubuntu.com/kubuntu/12.04/kubuntu-12.04-desktop-amd64.metalink
20-#metalink=http://releases.ubuntu.com/kubuntu/12.04/kubuntu-12.04-beta-desktop-amd64.metalink
21+metalink=http://cdimage.ubuntu.com/kubuntu/releases/12.04/release/kubuntu-12.04.1-desktop-amd64.metalink
22+#metalink=http://cdimage.ubuntu.com/kubuntu/releases/12.04/release/kubuntu-12.04-beta-desktop-amd64.metalink
23 metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/precise-desktop-amd64.metalink
24 website=http://www.kubuntu.org
25 ordering=3
26@@ -64,7 +64,7 @@
27 arch=i386
28 name=Xubuntu
29 packages=xubuntu-desktop
30-metalink=http://cdimage.ubuntu.com/xubuntu/releases/12.04/release/xubuntu-12.04-desktop-i386.metalink
31+metalink=http://cdimage.ubuntu.com/xubuntu/releases/12.04/release/xubuntu-12.04.1-desktop-i386.metalink
32 metalink2=http://cdimage.ubuntu.com/xubuntu/daily-live/current/precise-desktop-i386.metalink
33 website=http://www.xubuntu.org
34 ordering=4
35@@ -73,7 +73,7 @@
36 arch=amd64
37 name=Xubuntu
38 packages=xubuntu-desktop
39-metalink=http://cdimage.ubuntu.com/xubuntu/releases/12.04/release/xubuntu-12.04-desktop-amd64.metalink
40+metalink=http://cdimage.ubuntu.com/xubuntu/releases/12.04/release/xubuntu-12.04.1-desktop-amd64.metalink
41 metalink2=http://cdimage.ubuntu.com/xubuntu/daily-live/current/precise-desktop-amd64.metalink
42 website=http://www.xubuntu.org
43 ordering=4
44@@ -82,7 +82,7 @@
45 arch=i386
46 name=Mythbuntu
47 packages=ubuntu-standard
48-metalink=http://cdimage.ubuntu.com/mythbuntu/releases/12.04/release/mythbuntu-12.04-desktop-i386.metalink
49+metalink=http://cdimage.ubuntu.com/mythbuntu/releases/12.04/release/mythbuntu-12.04.1-desktop-i386.metalink
50 metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/precise-desktop-i386.metalink
51 website=http://www.mythbuntu.org
52 ordering=5
53@@ -91,7 +91,7 @@
54 arch=amd64
55 name=Mythbuntu
56 packages=ubuntu-standard
57-metalink=http://cdimage.ubuntu.com/mythbuntu/releases/12.04/release/mythbuntu-12.04-desktop-amd64.metalink
58+metalink=http://cdimage.ubuntu.com/mythbuntu/releases/12.04/release/mythbuntu-12.04.1-desktop-amd64.metalink
59 metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/precise-desktop-amd64.metalink
60 website=http://www.mythbuntu.org
61 ordering=5
62@@ -104,7 +104,7 @@
63 arch=i386
64 name=Edubuntu
65 packages=edubuntu-desktop
66-metalink=http://cdimage.ubuntu.com/edubuntu/releases/12.04/release/edubuntu-12.04-dvd-i386.metalink
67+metalink=http://cdimage.ubuntu.com/edubuntu/releases/12.04/release/edubuntu-12.04.1-dvd-i386.metalink
68 metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/precise-dvd-i386.metalink
69 website=http://www.edubuntu.org
70 ordering=6
71@@ -117,7 +117,7 @@
72 arch=amd64
73 name=Edubuntu
74 packages=edubuntu-desktop
75-metalink=http://cdimage.ubuntu.com/edubuntu/releases/12.04/release/edubuntu-12.04-dvd-amd64.metalink
76+metalink=http://cdimage.ubuntu.com/edubuntu/releases/12.04/release/edubuntu-12.04.1-dvd-amd64.metalink
77 metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/precise-dvd-amd64.metalink
78 website=http://www.edubuntu.org
79 ordering=6
80
81=== modified file 'debian/changelog'
82--- debian/changelog 2012-08-16 14:29:09 +0000
83+++ debian/changelog 2012-10-29 00:06:21 +0000
84@@ -1,3 +1,9 @@
85+wubi (12.04ubuntu1) UNRELEASED; urgency=low
86+
87+ * Correct metalink addresses for ku/xu/edu/mythbuntu (LP: #1067833)
88+
89+ -- bcbc <openbcbc@gmail.com> Sun, 28 Oct 2012 16:36:44 -0700
90+
91 wubi (12.04) precise; urgency=low
92
93 [ bcbc ]

Subscribers

People subscribed via source and target branches

to all changes: