From a5f566c2c68361568033c3279e5b93bae165883a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= <filmroellchen@serenityos.org>
Date: Wed, 4 Oct 2023 12:02:47 +0200
Subject: [PATCH] pkg: Always use correct installed.db

The access() check was on the wrong file previously.
---
 Userland/Utilities/pkg/InstalledPort.cpp | 2 +-
 Userland/Utilities/pkg/InstalledPort.h   | 2 ++
 Userland/Utilities/pkg/main.cpp          | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Userland/Utilities/pkg/InstalledPort.cpp b/Userland/Utilities/pkg/InstalledPort.cpp
index ca78dbfb0c..4e51b01b21 100644
--- a/Userland/Utilities/pkg/InstalledPort.cpp
+++ b/Userland/Utilities/pkg/InstalledPort.cpp
@@ -11,7 +11,7 @@
 
 ErrorOr<HashMap<String, InstalledPort>> InstalledPort::read_ports_database()
 {
-    auto file = TRY(Core::File::open("/usr/Ports/installed.db"sv, Core::File::OpenMode::Read));
+    auto file = TRY(Core::File::open(ports_database, Core::File::OpenMode::Read));
     auto buffered_file = TRY(Core::InputBufferedFile::create(move(file)));
     auto buffer = TRY(ByteBuffer::create_uninitialized(PAGE_SIZE));
 
diff --git a/Userland/Utilities/pkg/InstalledPort.h b/Userland/Utilities/pkg/InstalledPort.h
index 5969c72ee8..414c0a504b 100644
--- a/Userland/Utilities/pkg/InstalledPort.h
+++ b/Userland/Utilities/pkg/InstalledPort.h
@@ -11,6 +11,8 @@
 #include <AK/StringView.h>
 #include <AK/Types.h>
 
+constexpr StringView ports_database = "/usr/Ports/installed.db"sv;
+
 class InstalledPort {
 public:
     enum class Type {
diff --git a/Userland/Utilities/pkg/main.cpp b/Userland/Utilities/pkg/main.cpp
index 00b0477c29..8a4839a985 100644
--- a/Userland/Utilities/pkg/main.cpp
+++ b/Userland/Utilities/pkg/main.cpp
@@ -54,8 +54,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     HashMap<String, InstalledPort> installed_ports;
     HashMap<String, AvailablePort> available_ports;
     if (show_all_installed_ports || show_all_dependency_ports || !query_package.is_null()) {
-        if (Core::System::access("/usr/Ports/installed.md"sv, R_OK).is_error()) {
-            warnln("pkg: /usr/Ports/installed.md isn't accessible, did you install a package in the past?");
+        if (Core::System::access(ports_database, R_OK).is_error()) {
+            warnln("pkg: {} isn't accessible, did you install a package in the past?", ports_database);
             return 1;
         }
         installed_ports = TRY(InstalledPort::read_ports_database());