From 1c17a09696dee507fc909c8651d193817711e9e1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Sep 2014 15:40:36 +0100 Subject: [PATCH 10/14] MSYS2: hasPacmanDatabase() getMSYS2Root() changes --- src/constants.h | 5 +++-- src/package.cpp | 11 ++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/constants.h b/src/constants.h index 8bbdfc7..59ab7e8 100644 --- a/src/constants.h +++ b/src/constants.h @@ -84,8 +84,9 @@ const QString ctn_KEEP_NUM_UNINSTALLED("Keep_Num_Uninstalled"); //Package related const QString ctn_TEMP_ACTIONS_FILE ( QDir::tempPath() + QDir::separator() + ".qt_temp_" ); -const QString ctn_PACMAN_DATABASE_DIR = "/var/lib/pacman"; -const QString ctn_PACMAN_CORE_DB_FILE = "/var/lib/pacman/sync/core.db"; +const QString ctn_PACMAN_DATABASE_DIR = "/var/lib/pacman"; +const QString ctn_PACMAN_CORE_DB_FILE = "/var/lib/pacman/sync/core.db"; +const QString ctn_PACMAN_MSYS2_DB_FILE = "/var/lib/pacman/sync/msys.db"; enum PackageStatus { ectn_INSTALLED, ectn_NON_INSTALLED, ectn_OUTDATED, ectn_NEWER, ectn_FOREIGN, ectn_FOREIGN_OUTDATED }; diff --git a/src/package.cpp b/src/package.cpp index 629b485..9be5040 100644 --- a/src/package.cpp +++ b/src/package.cpp @@ -1402,7 +1402,16 @@ bool Package::hasPacmanDatabase() if (!done) { - QFile f(ctn_PACMAN_CORE_DB_FILE); + QString dbFile; + if (UnixCommand::getLinuxDistro() == ectn_MSYS2) + { + dbFile = UnixCommand::getMSYS2Root() + ctn_PACMAN_MSYS2_DB_FILE; + } + else + { + dbFile = ctn_PACMAN_CORE_DB_FILE; + } + QFile f(dbFile); answer = f.exists(); done = true; } -- 2.8.2