From 05480e20bc4c9d56ea8b31622166102ae90c7276 Mon Sep 17 00:00:00 2001
From: Mürsel Türk
Date: Mon, 10 Oct 2022 19:50:12 +0200
Subject: Some improvements

---
 tools/inspect_apps.py | 22 +++++++++++-----------
 tools/inspect_os.py   | 12 +++++++-----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tools/inspect_apps.py b/tools/inspect_apps.py
index a1a1157..2b9f57d 100644
--- a/tools/inspect_apps.py
+++ b/tools/inspect_apps.py
@@ -1,7 +1,6 @@
 import logging
 import os
 import re
-import tempfile
 
 from . import log, subdirs
 
@@ -126,8 +125,9 @@ def list_applications_dpkg(path):
                 if os.path.exists(db):
                     dpkg_db = db
                     break
-            if dpkg_db is not None:
-                break
+            else:
+                continue
+            break
 
     if dpkg_db is None:
         L.debug("dpkg database not found")
@@ -193,8 +193,9 @@ def list_applications_pacman(path):
                 if os.path.exists(db):
                     pacman_db = db
                     break
-            if pacman_db is not None:
-                break
+            else:
+                continue
+            break
 
     if pacman_db is None:
         L.debug("pacman database not found")
@@ -213,7 +214,7 @@ def list_applications_pacman(path):
                     n = len(lines)
                     v = "" if n < 2 else lines[1:] if n > 2 else lines[1]
                     kv[k] = v
-        if (name := kv.get("NAME", "")) and (version := kv.get("VERSION", "")):
+        if (name := kv.get("NAME")) and (version := kv.get("VERSION")):
             pkgs.append({
                 "name": name,
                 "version": version
@@ -258,8 +259,9 @@ def list_applications_portage(path):
                 if os.path.exists(db):
                     portage_db = db
                     break
-            if portage_db is not None:
-                break
+            else:
+                continue
+            break
 
     if portage_db is None:
         L.debug("portage database not found")
@@ -312,9 +314,7 @@ def list_applications_rpm(path):
         L.debug("RPM database not found")
         return []
 
-    log_file = tempfile.TemporaryFile()
-    rpm.setLogFile(log_file)
-    rpm.setVerbosity(rpm.RPMLOG_DEBUG)
+    rpm.setVerbosity(rpm.RPMLOG_CRIT)
     rpm.addMacro("_dbpath", rpm_db)
     ts = rpm.TransactionSet()
 
diff --git a/tools/inspect_os.py b/tools/inspect_os.py
index 892ca8a..e374464 100644
--- a/tools/inspect_os.py
+++ b/tools/inspect_os.py
@@ -36,15 +36,17 @@ def get_linux_os_info(path):
     release_files = {}
     for root, dirs, _ in os.walk(path):
         if "etc" in dirs:
-            skip = False
             for f in iglob(f"{root}/etc/*release"):
                 # Hack for immutable operating systems of Fedora.
                 if not os.path.exists(f):
-                    skip = True
+                    release_files.clear()
                     break
-                release_files[os.path.basename(f)] = f
-            if release_files and not skip:
-                break
+                if os.path.isfile(f):
+                    release_files[os.path.basename(f)] = f
+            else:
+                if release_files:
+                    break
+            continue
 
     if not release_files:
         L.debug("no release file found")
-- 
cgit v1.2.3-55-g7522