From 26248b09cf9ded10cb45fea4d00a71cf1020c826 Mon Sep 17 00:00:00 2001
From: Reilly Brogan <reilly@reillybrogan.com>
Date: Tue, 16 Jul 2024 18:21:24 -0500
Subject: [PATCH] Fix usr-merge file checking

Handle the case with `eopkg check` where the top-level directory has been converted to a symlink and the files were reporting as corrupted.
---
 pisi/operations/check.py | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/pisi/operations/check.py b/pisi/operations/check.py
index 178f965..51162d4 100644
--- a/pisi/operations/check.py
+++ b/pisi/operations/check.py
@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2005-2011 TUBITAK/UEKAE, 2013-2017 Ikey Doherty, Solus Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from copy import deepcopy
 import os
 import pisi
 import pisi.context as ctx
@@ -34,6 +35,21 @@ def file_corrupted(pfile):
     "modules.symbols.bin",
 ]
 
+_top_level_dirs = [
+    "/bin/",
+    "/lib/",
+    "/lib32/",
+    "/lib64/",
+    "/sbin/",
+]
+
+_empty_results = {
+                'missing'   :   [],
+                'corrupted' :   [],
+                'denied'    :   [],
+                'config'    :   [],
+                }
+
 
 def ignorance_is_bliss(f):
     """Too many complaints about things that are missing."""
@@ -41,11 +57,17 @@ def ignorance_is_bliss(f):
     if not p.startswith("/"):
         p = "/{}".format(f)
 
+    if not p.startswith("/usr"):
+        for top in _top_level_dirs:
+            if p.startswith(top):
+                if os.path.islink(top.rstrip("/")):
+                    return True
+
     pbas = os.path.basename(p)
     p = p.replace("/lib64/", "/lib/")
 
     # Ignore kernel depmod changes?
-    if p.startswith("/lib/modules"):
+    if p.startswith("/lib/modules") or p.startswith("/usr/lib/modules"):
         if pbas in _blessed_kernel_borks:
             return True
 
@@ -55,12 +77,7 @@ def ignorance_is_bliss(f):
 
 
 def check_files(files, check_config=False):
-    results = {
-        "missing": [],
-        "corrupted": [],
-        "denied": [],
-        "config": [],
-    }
+    results = deepcopy(_empty_results)
 
     for f in files:
         if not check_config and f.type == "config":
@@ -106,6 +123,9 @@ def check_package_files(package):
 
 
 def check_package(package, config=False):
+    # Temporary hack until epoch
+    if package == "baselayout":
+        return deepcopy(_empty_results)
     if config:
         return check_config_files(package)
     else: