diff options
-rw-r--r-- | tools/common/repositorygen.cpp | 12 | ||||
-rw-r--r-- | tools/common/repositorygen.h | 1 | ||||
-rw-r--r-- | tools/repogen/repogen.cpp | 10 |
3 files changed, 10 insertions, 13 deletions
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index e25af0dd6..b119c392a 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -73,6 +73,13 @@ void QInstallerTools::printRepositoryGenOptions() std::cout << " --ignore-invalid-packages Ignore all invalid packages instead of aborting." << std::endl; } +QString QInstallerTools::makePathAbsolute(const QString &path) +{ + if (QFileInfo(path).isRelative()) + return QDir::current().absoluteFilePath(path); + return path; +} + void QInstallerTools::copyWithException(const QString &source, const QString &target, const QString &kind) { qDebug() << QString::fromLatin1("Copying associated %1 file '%2'").arg(kind, source); @@ -104,10 +111,7 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt const PackageInfoVector &packages, const QString &appName, const QString &appVersion, const QString &redirectUpdateUrl) { - QString metapath = outDir; - if (QFileInfo(metapath).isRelative()) - metapath = QDir::cleanPath(QDir::current().absoluteFilePath(metapath)); - + const QString metapath = makePathAbsolute(outDir); if (!QFile::exists(metapath)) QInstaller::mkpath(metapath); diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h index 71426ba7f..5085d526b 100644 --- a/tools/common/repositorygen.h +++ b/tools/common/repositorygen.h @@ -65,6 +65,7 @@ enum FilterType { Exclude }; +QString makePathAbsolute(const QString &path); QHash<QString, QString> buildPathToVersionMapping(const PackageInfoVector &info); void copyWithException(const QString &source, const QString &target, const QString &kind = QString()); diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp index 1380e4ebf..d319b2c89 100644 --- a/tools/repogen/repogen.cpp +++ b/tools/repogen/repogen.cpp @@ -90,14 +90,6 @@ static int printErrorAndUsageAndExit(const QString &err) return 1; } -static QString makeAbsolute(const QString &path) -{ - QFileInfo fi(path); - if (fi.isAbsolute()) - return path; - return QDir::current().absoluteFilePath(path); -} - int main(int argc, char** argv) { try { @@ -188,7 +180,7 @@ int main(int argc, char** argv) "exclusive!")); } - const QString repositoryDir = makeAbsolute(args.first()); + const QString repositoryDir = QInstallerTools::makePathAbsolute(args.first()); if (remove) QInstaller::removeDirectory(repositoryDir); |