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

Proposed by Geza Kovacs
Status: Merged
Merge reported by: Luke Faraone
Merged at revision: not available
Proposed branch: lp:~gezakovacs/ubuntu/maverick/unetbootin/fix-10.10-desktop-iso-loading
Merge into: lp:ubuntu/maverick/unetbootin
Diff against target: 163 lines (+108/-5)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
unetbootin.cpp (+100/-4)
To merge this branch: bzr merge lp:~gezakovacs/ubuntu/maverick/unetbootin/fix-10.10-desktop-iso-loading
Reviewer Review Type Date Requested Status
Luke Faraone Approve
Review via email: mp+36953@code.launchpad.net

Description of the change

Fixes issues when loading Ubuntu 10.10 desktop iso. Has been tested against ubuntu-10.10-beta-desktop-amd64.iso. Corresponds to upstream commit http://github.com/gkovacs/unetbootin/commit/feab255c7c67b9663092be2420fb69a1fc32d446#diff-1 (LP: #615285)

To post a comment you must log in.
Revision history for this message
Luke Faraone (lfaraone) :
review: Approve
Revision history for this message
Luke Faraone (lfaraone) wrote :

 * You don't need to use "ubuntu0.10.10.1", this isn't a SRU. "ubuntu1" will suffice.
 * Please run update-maintainer to comply with <https://wiki.ubuntu.com/DebianMaintainerField>

review: Needs Fixing
20. By Geza Kovacs

switch to ubuntu1 version suffix (not an SRU), and ran update-maintainer

Revision history for this message
Luke Faraone (lfaraone) wrote :

Merged, thanks.

review: Approve

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-06-13 21:30:22 +0000
3+++ debian/changelog 2010-09-29 19:02:40 +0000
4@@ -1,3 +1,9 @@
5+unetbootin (471-1ubuntu1) maverick; urgency=low
6+
7+ * Fixes issues when loading Ubuntu 10.10 desktop iso. (LP: #615285)
8+
9+ -- Geza Kovacs <gkovacs@mit.edu> Wed, 29 Sep 2010 14:54:28 -0400
10+
11 unetbootin (471-1) unstable; urgency=low
12
13 * New upstream release.
14
15=== modified file 'debian/control'
16--- debian/control 2010-04-15 20:13:52 +0000
17+++ debian/control 2010-09-29 19:02:40 +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.4
27 Vcs-Git: git://git.debian.org/git/collab-maint/unetbootin.git
28
29=== modified file 'unetbootin.cpp'
30--- unetbootin.cpp 2010-06-13 21:30:22 +0000
31+++ unetbootin.cpp 2010-09-29 19:02:40 +0000
32@@ -2151,7 +2151,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@@ -2179,7 +2203,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)
98@@ -2207,7 +2255,31 @@
99 {
100 includesfile = includesfile.right(includesfile.size() - 1).trimmed();
101 }
102- QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
103+ QStringList includesfileL;
104+ for (int i = 0; i < archivefileconts.size(); ++i)
105+ {
106+ QString curentry = archivefileconts.at(i);
107+ if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
108+ {
109+ curentry = curentry.left(curentry.size() - 1).trimmed();
110+ }
111+ if (curentry.contains("/"))
112+ {
113+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
114+ }
115+ else if (curentry.contains(QDir::toNativeSeparators("/")))
116+ {
117+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
118+ }
119+ if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
120+ {
121+ includesfileL.append(archivefileconts.at(i));
122+ }
123+ }
124+ if (includesfileL.isEmpty())
125+ {
126+ includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
127+ }
128 if (!includesfileL.isEmpty())
129 {
130 for (int i = 0; i < includesfileL.size(); ++i)
131@@ -2235,7 +2307,31 @@
132 {
133 includesfile = includesfile.right(includesfile.size() - 1).trimmed();
134 }
135- QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
136+ QStringList includesfileL;
137+ for (int i = 0; i < archivefileconts.size(); ++i)
138+ {
139+ QString curentry = archivefileconts.at(i);
140+ if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
141+ {
142+ curentry = curentry.left(curentry.size() - 1).trimmed();
143+ }
144+ if (curentry.contains("/"))
145+ {
146+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
147+ }
148+ else if (curentry.contains(QDir::toNativeSeparators("/")))
149+ {
150+ curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
151+ }
152+ if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
153+ {
154+ includesfileL.append(archivefileconts.at(i));
155+ }
156+ }
157+ if (includesfileL.isEmpty())
158+ {
159+ includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
160+ }
161 if (!includesfileL.isEmpty())
162 {
163 for (int i = 0; i < includesfileL.size(); ++i)

Subscribers

People subscribed via source and target branches

to all changes: