Merge lp:~gezakovacs/ubuntu/lucid/unetbootin/fix-10.10-desktop-iso-loading into lp:ubuntu/lucid-updates/unetbootin

Proposed by Luke Faraone on 2010-10-06
Status: Needs review
Proposed branch: lp:~gezakovacs/ubuntu/lucid/unetbootin/fix-10.10-desktop-iso-loading
Merge into: lp:ubuntu/lucid-updates/unetbootin
Diff against target: 97 lines (+58/-3)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
unetbootin.cpp (+50/-2)
To merge this branch: bzr merge lp:~gezakovacs/ubuntu/lucid/unetbootin/fix-10.10-desktop-iso-loading
Reviewer Review Type Date Requested Status
Luke Faraone Approve on 2010-10-06
Review via email: mp+37784@code.launchpad.net

Description of the change

Fixes generated menu entries when loading Ubuntu 10.10 desktop iso. Has been tested against ubuntu-10.10-rc-desktop-amd64.iso and ubuntu-10.04-desktop-i386.iso

To post a comment you must log in.
Luke Faraone (lfaraone) wrote :

FYI, instead of incrementing the "0ubuntu1" revision for SRUs, we increment the portion after that: "0ubuntu0.10.04.2".

I filled out the SRU information for this bug. In the future, the sponsoree is expected to have already done so.

review: Approve

Unmerged revisions

17. By Geza Kovacs on 2010-10-06

Fixes issues when loading Ubuntu 10.10 desktop iso. (LP: #615285)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-05-11 11:11:22 +0000
3+++ debian/changelog 2010-10-06 20:08:57 +0000
4@@ -1,3 +1,9 @@
5+unetbootin (408-1ubuntu1.10.04.1) lucid-proposed; urgency=low
6+
7+ * Fixes issues when loading Ubuntu 10.10 desktop iso. (LP: #615285)
8+
9+ -- Geza Kovacs <gkovacs@mit.edu> Wed, 06 Oct 2010 15:33:58 -0400
10+
11 unetbootin (408-1ubuntu0.10.04.1) lucid-proposed; urgency=low
12
13 * Include Ubuntu 10.04 LTS in the dropdown list for Ubuntu. (LP: #578841)
14
15=== modified file 'debian/control'
16--- debian/control 2009-09-27 14:48:46 +0000
17+++ debian/control 2010-10-06 20:08:57 +0000
18@@ -1,7 +1,8 @@
19 Source: unetbootin
20 Section: utils
21 Priority: optional
22-Maintainer: Eugene V. Lyubimkin <jackyf@debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Eugene V. Lyubimkin <jackyf@debian.org>
25 Build-Depends: syslinux, debhelper (>= 7), libqt4-dev (>= 4.2)
26 Standards-Version: 3.8.3
27 Vcs-Git: git://git.debian.org/git/collab-maint/unetbootin.git
28
29=== modified file 'unetbootin.cpp'
30--- unetbootin.cpp 2010-02-14 09:16:41 +0000
31+++ unetbootin.cpp 2010-10-06 20:08:57 +0000
32@@ -1636,7 +1636,31 @@
33 {
34 includesfile = includesfile.right(includesfile.size() - 1).trimmed();
35 }
36- QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
37+ QStringList includesfileL;
38+ for (int i = 0; i < archivefileconts.size(); ++i)
39+ {
40+ QString curentry = archivefileconts.at(i);
41+ if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
42+ {
43+ curentry = curentry.left(curentry.size() - 1).trimmed();
44+ }
45+ if (curentry.contains("/"))
46+ {
47+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
48+ }
49+ else if (curentry.contains(QDir::toNativeSeparators("/")))
50+ {
51+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
52+ }
53+ if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
54+ {
55+ includesfileL.append(archivefileconts.at(i));
56+ }
57+ }
58+ if (includesfileL.isEmpty())
59+ {
60+ includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
61+ }
62 if (!includesfileL.isEmpty())
63 {
64 for (int i = 0; i < includesfileL.size(); ++i)
65@@ -1660,7 +1684,31 @@
66 {
67 includesfile = includesfile.right(includesfile.size() - 1).trimmed();
68 }
69- QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
70+ QStringList includesfileL;
71+ for (int i = 0; i < archivefileconts.size(); ++i)
72+ {
73+ QString curentry = archivefileconts.at(i);
74+ if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
75+ {
76+ curentry = curentry.left(curentry.size() - 1).trimmed();
77+ }
78+ if (curentry.contains("/"))
79+ {
80+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
81+ }
82+ else if (curentry.contains(QDir::toNativeSeparators("/")))
83+ {
84+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
85+ }
86+ if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
87+ {
88+ includesfileL.append(archivefileconts.at(i));
89+ }
90+ }
91+ if (includesfileL.isEmpty())
92+ {
93+ includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
94+ }
95 if (!includesfileL.isEmpty())
96 {
97 for (int i = 0; i < includesfileL.size(); ++i)

Subscribers

People subscribed via source and target branches

to all changes: