Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed bug in locating files included via syslinux and grub2 include s…
…tatement, should fix Ubuntu 10.10 desktop iso issues
  • Loading branch information
gkovacs committed Sep 29, 2010
1 parent e2d1a5c commit feab255
Show file tree
Hide file tree
Showing 46 changed files with 1,580 additions and 1,484 deletions.
56 changes: 28 additions & 28 deletions po/unetbootin.pot
Expand Up @@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-06-22 20:30-0700\n"
"POT-Creation-Date: 2010-09-29 00:49-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -20,8 +20,8 @@ msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:189 unetbootin.cpp:261 unetbootin.cpp:262 unetbootin.cpp:329
#: unetbootin.cpp:450 unetbootin.cpp:543 unetbootin.cpp:2973
#: unetbootin.cpp:2986 unetbootin.cpp:3144 unetbootin.cpp:3599
#: unetbootin.cpp:450 unetbootin.cpp:543 unetbootin.cpp:3072
#: unetbootin.cpp:3085 unetbootin.cpp:3243 unetbootin.cpp:3698
#, fuzzy
msgid "Hard Disk"
msgstr ""
Expand All @@ -30,23 +30,23 @@ msgstr ""
#: unetbootin.cpp:190 unetbootin.cpp:244 unetbootin.cpp:258 unetbootin.cpp:259
#: unetbootin.cpp:331 unetbootin.cpp:454 unetbootin.cpp:548 unetbootin.cpp:620
#: unetbootin.cpp:636 unetbootin.cpp:890 unetbootin.cpp:1421
#: unetbootin.cpp:1483 unetbootin.cpp:2306 unetbootin.cpp:2348
#: unetbootin.cpp:2977 unetbootin.cpp:3002 unetbootin.cpp:3148
#: unetbootin.cpp:3603
#: unetbootin.cpp:1483 unetbootin.cpp:2405 unetbootin.cpp:2447
#: unetbootin.cpp:3076 unetbootin.cpp:3101 unetbootin.cpp:3247
#: unetbootin.cpp:3702
#, fuzzy
msgid "USB Drive"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:191 unetbootin.cpp:208 unetbootin.cpp:209 unetbootin.cpp:297
#: unetbootin.cpp:571 unetbootin.cpp:572 unetbootin.cpp:3050
#: unetbootin.cpp:571 unetbootin.cpp:572 unetbootin.cpp:3149
#, fuzzy
msgid "ISO"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:192 unetbootin.cpp:204 unetbootin.cpp:205 unetbootin.cpp:302
#: unetbootin.cpp:576 unetbootin.cpp:577 unetbootin.cpp:3042
#: unetbootin.cpp:576 unetbootin.cpp:577 unetbootin.cpp:3141
#, fuzzy
msgid "Floppy"
msgstr ""
Expand Down Expand Up @@ -268,7 +268,7 @@ msgid "<b>Copied:</b> 0 bytes"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2400
#: unetbootin.cpp:2499
#, fuzzy
msgid "<b>Copied:</b> %1 of %2"
msgstr ""
Expand Down Expand Up @@ -322,117 +322,117 @@ msgid "<b>Extracted:</b> %1 of %2 files"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2290
#: unetbootin.cpp:2389
#, fuzzy
msgid "Downloading files, please wait..."
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:1583 unetbootin.cpp:2291
#: unetbootin.cpp:1583 unetbootin.cpp:2390
#, fuzzy
msgid "<b>Source:</b> <a href=\"%1\">%1</a>"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:1584 unetbootin.cpp:2292
#: unetbootin.cpp:1584 unetbootin.cpp:2391
#, fuzzy
msgid "<b>Destination:</b> %1"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2293
#: unetbootin.cpp:2392
#, fuzzy
msgid "<b>Downloaded:</b> 0 bytes"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2370 unetbootin.cpp:2385
#: unetbootin.cpp:2469 unetbootin.cpp:2484
#, fuzzy
msgid "<b>Downloaded:</b> %1 of %2"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2476
#: unetbootin.cpp:2575
#, fuzzy
msgid "Searching in <a href=\"%1\">%1</a>"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2480
#: unetbootin.cpp:2579
#, fuzzy
msgid "%1/%2 matches in <a href=\"%3\">%3</a>"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2665
#: unetbootin.cpp:2764
#, fuzzy
msgid "%1 not found"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2666
#: unetbootin.cpp:2765
#, fuzzy
msgid ""
"%1 not found. This is required for %2 install mode.\n"
"Install the \"%3\" package or your distribution's equivalent."
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2955
#: unetbootin.cpp:3054
#, fuzzy
msgid "(Current)"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:2956
#: unetbootin.cpp:3055
#, fuzzy
msgid "(Done)"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3223
#: unetbootin.cpp:3322
#, fuzzy
msgid "Configuring grub2 on %1"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3235
#: unetbootin.cpp:3334
#, fuzzy
msgid "Configuring grldr on %1"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3263
#: unetbootin.cpp:3362
#, fuzzy
msgid "Configuring grub on %1"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3448
#: unetbootin.cpp:3547
#, fuzzy
msgid "Installing syslinux to %1"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3483
#: unetbootin.cpp:3582
#, fuzzy
msgid "Installing extlinux to %1"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3589
#: unetbootin.cpp:3688
#, fuzzy
msgid "Syncing filesystems"
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3601
#: unetbootin.cpp:3700
#, fuzzy
msgid "After rebooting, select the "
msgstr ""

#. ts-context unetbootin
#: unetbootin.cpp:3605
#: unetbootin.cpp:3704
#, fuzzy
msgid ""
"After rebooting, select the USB boot option in the BIOS boot menu.%1\n"
Expand Down
104 changes: 100 additions & 4 deletions src/unetbootin/unetbootin.cpp
Expand Up @@ -2163,7 +2163,31 @@ QString unetbootin::searchforincludesfile(QString includesfile, QString archivef
{
includesfile = includesfile.right(includesfile.size() - 1).trimmed();
}
QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
QStringList includesfileL;
for (int i = 0; i < archivefileconts.size(); ++i)
{
QString curentry = archivefileconts.at(i);
if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
{
curentry = curentry.left(curentry.size() - 1).trimmed();
}
if (curentry.contains("/"))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
}
else if (curentry.contains(QDir::toNativeSeparators("/")))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
}
if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
{
includesfileL.append(archivefileconts.at(i));
}
}
if (includesfileL.isEmpty())
{
includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
}
if (!includesfileL.isEmpty())
{
for (int i = 0; i < includesfileL.size(); ++i)
Expand Down Expand Up @@ -2191,7 +2215,31 @@ QPair<QPair<QStringList, QStringList>, QPair<QStringList, QStringList> > unetboo
{
includesfile = includesfile.right(includesfile.size() - 1).trimmed();
}
QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
QStringList includesfileL;
for (int i = 0; i < archivefileconts.size(); ++i)
{
QString curentry = archivefileconts.at(i);
if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
{
curentry = curentry.left(curentry.size() - 1).trimmed();
}
if (curentry.contains("/"))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
}
else if (curentry.contains(QDir::toNativeSeparators("/")))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
}
if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
{
includesfileL.append(archivefileconts.at(i));
}
}
if (includesfileL.isEmpty())
{
includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
}
if (!includesfileL.isEmpty())
{
for (int i = 0; i < includesfileL.size(); ++i)
Expand Down Expand Up @@ -2219,7 +2267,31 @@ QString unetbootin::searchforgrub2includesfile(QString includesfile, QString arc
{
includesfile = includesfile.right(includesfile.size() - 1).trimmed();
}
QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
QStringList includesfileL;
for (int i = 0; i < archivefileconts.size(); ++i)
{
QString curentry = archivefileconts.at(i);
if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
{
curentry = curentry.left(curentry.size() - 1).trimmed();
}
if (curentry.contains("/"))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
}
else if (curentry.contains(QDir::toNativeSeparators("/")))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
}
if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
{
includesfileL.append(archivefileconts.at(i));
}
}
if (includesfileL.isEmpty())
{
includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
}
if (!includesfileL.isEmpty())
{
for (int i = 0; i < includesfileL.size(); ++i)
Expand Down Expand Up @@ -2247,7 +2319,31 @@ QPair<QPair<QStringList, QStringList>, QPair<QStringList, QStringList> > unetboo
{
includesfile = includesfile.right(includesfile.size() - 1).trimmed();
}
QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
QStringList includesfileL;
for (int i = 0; i < archivefileconts.size(); ++i)
{
QString curentry = archivefileconts.at(i);
if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
{
curentry = curentry.left(curentry.size() - 1).trimmed();
}
if (curentry.contains("/"))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
}
else if (curentry.contains(QDir::toNativeSeparators("/")))
{
curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
}
if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
{
includesfileL.append(archivefileconts.at(i));
}
}
if (includesfileL.isEmpty())
{
includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
}
if (!includesfileL.isEmpty())
{
for (int i = 0; i < includesfileL.size(); ++i)
Expand Down

0 comments on commit feab255

Please sign in to comment.