diff options
Diffstat (limited to 'tools/repogen/repogen.cpp')
| -rw-r--r-- | tools/repogen/repogen.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp index 60fd37cb1..67184c49e 100644 --- a/tools/repogen/repogen.cpp +++ b/tools/repogen/repogen.cpp @@ -30,7 +30,7 @@ #include <errors.h> #include <fileutils.h> #include <init.h> -#include <kdupdater.h> +#include <updater.h> #include <settings.h> #include <utils.h> #include <lib7z_facade.h> @@ -46,7 +46,6 @@ #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) -using namespace Lib7z; using namespace QInstaller; static void printUsage() @@ -188,7 +187,7 @@ int main(int argc, char** argv) QDir::AllEntries | QDir::NoDotAndDotDot).isEmpty()) { throw QInstaller::Error(QCoreApplication::translate("QInstaller", - "Repository target folder %1 already exists!").arg(repositoryDir)); + "Repository target directory \"%1\" already exists.").arg(QDir::toNativeSeparators(repositoryDir))); } QInstallerTools::PackageInfoVector packages = QInstallerTools::createListOfPackages(packagesDirectories, @@ -201,7 +200,7 @@ int main(int argc, char** argv) const QDomElement root = doc.documentElement(); if (root.tagName() != QLatin1String("Updates")) { throw QInstaller::Error(QCoreApplication::translate("QInstaller", - "Invalid content in '%1'.").arg(file.fileName())); + "Invalid content in \"%1\".").arg(QDir::toNativeSeparators(file.fileName()))); } file.close(); // close the file, we read the content already @@ -216,7 +215,7 @@ int main(int argc, char** argv) for (int j = 0; j < c2.count(); ++j) { if (c2.at(j).toElement().tagName() == scName) info.name = c2.at(j).toElement().text(); - else if (c2.at(j).toElement().tagName() == scRemoteVersion) + else if (c2.at(j).toElement().tagName() == scVersion) info.version = c2.at(j).toElement().text(); } hash.insert(info.name, info); @@ -234,7 +233,7 @@ int main(int argc, char** argv) } if (packages.isEmpty()) { - std::cout << QString::fromLatin1("Could not find new components to update '%1'.") + std::cout << QString::fromLatin1("Cannot find new components to update \"%1\".") .arg(repositoryDir) << std::endl; return EXIT_SUCCESS; } |