exosphere-cli 2.4.1__tar.gz → 2.4.2__tar.gz

{exosphere_cli-2.4.1 → exosphere_cli-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exosphere-cli
-Version: 2.4.1
+Version: 2.4.2
 Summary: CLI/TUI driven patch reporting for remote Unix-like systems.
 Author: Alexandre Gauthier
 Author-email: Alexandre Gauthier <alex@underwares.org>

{exosphere_cli-2.4.1 → exosphere_cli-2.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "exosphere-cli"
-version = "2.4.1"
+version = "2.4.2"
 description = "CLI/TUI driven patch reporting for remote Unix-like systems."
 readme = "README.md"
 authors = [
@@ -48,14 +48,14 @@ dev = [
     "pytest-cov>=6.1.1",
     "pytest-json-ctrf>=0.3.5",
     "pytest-mock>=3.14.1",
-    "renku-sphinx-theme>=0.5.0",
+    "sphinx-rtd-theme>=3.0.2",
     "ruff>=0.15.0",
-    "sphinx>=8.2.3,<9.0",
+    "sphinx>=8.2.3",
     "sphinx-autobuild>=2024.10.3",
     "sphinx-lint>=1.0.0",
     "sphinx-tabs>=3.4.7",
     "sphinxcontrib-spelling>=8.0.1",
-    "sphinxcontrib-typer>=0.5.1",
+    "sphinxcontrib-typer>=0.7.2",
     "textual-dev>=1.7.0",
 ]
 

{exosphere_cli-2.4.1 → exosphere_cli-2.4.2}/src/exosphere/providers/debian.py

@@ -50,6 +50,10 @@ class Apt(PkgManager):
             )
             return False
 
+        # Log warnings from apt-get if there was any stderr output.
+        if update.stderr:
+            self._log_apt_warn(update.stderr)
+
         self.logger.debug("Apt repositories synchronized successfully")
 
         return True
@@ -79,6 +83,10 @@ class Apt(PkgManager):
             self.logger.debug("No updates available or no matches in output.")
             return updates
 
+        # Log warnings from apt-get if there was any stderr output.
+        if raw_query.stderr:
+            self._log_apt_warn(raw_query.stderr)
+
         for line in raw_query.stdout.splitlines():
             line = line.strip()
 
@@ -151,3 +159,16 @@ class Apt(PkgManager):
             source=repo_source,
             security=is_security,
         )
+
+    def _log_apt_warn(self, lines: str) -> None:
+        """
+        Log warnings from APT stderr output.
+        We ignore empty lines and lines that do not begin with "W:"
+
+        :param lines: Stderr output to log.
+        """
+        for line in lines.splitlines():
+            line = line.strip()
+            if not line or not line.startswith("W: "):
+                continue
+            self.logger.warning("APT: %s", line)

{exosphere_cli-2.4.1 → exosphere_cli-2.4.2}/src/exosphere/providers/redhat.py

@@ -216,11 +216,14 @@ class Dnf(PkgManager):
         """
 
         # Lazy compile the line pattern on first use
+        # Repository source component is usually in the form of "reponame"
+        # but can be prefixed with "@" or in the case of missing metadata,
+        # be the string "<unknown>" or similar. We account for these here.
         if self.line_pattern is None:
             self.line_pattern = re.compile(
                 r"^(?P<name>[a-z0-9][\w+.-]*\.\w+)\s+"  # Package (name.arch)
                 r"(?P<version>[\w.+~:-]+-[\w.+~]+)\s+"  # RPM version-release
-                r"(?P<source>@?[a-z0-9][\w.:+/-]*)$",  # Repo source (optional @)
+                r"(?P<source>@?[a-z0-9][\w.:+/-]*|<[^>\s]+>)$",  # Repo source (optional @ or <>
                 re.ASCII | re.IGNORECASE,
             )
 
@@ -230,7 +233,10 @@ class Dnf(PkgManager):
             self.logger.debug("Skipping garbage line: %s", line)
             return None
 
-        return (match["name"], match["version"], match["source"].removeprefix("@"))
+        # Cleanup source string before sending it up
+        source = match["source"].removeprefix("@").strip("<>")
+
+        return (match["name"], match["version"], source)
 
     def _get_current_version(
         self, cx: Connection, package_names: list[str]

{exosphere_cli-2.4.1 → exosphere_cli-2.4.2}/src/exosphere/setup/detect.py

@@ -30,6 +30,10 @@ def platform_detect(cx: Connection) -> HostInfo:
     Detect the platform of the remote system.
     Entry point for refreshing all platform details.
 
+    Linux detection in general depends on the presence of a well-formed
+    /etc/os-release file, which is a safe assumption for everything we
+    explicitly support that's not EOL'd.
+
     :param cx: Fabric Connection object
     :return: HostInfo object with platform details
     """
@@ -114,8 +118,6 @@ def flavor_detect(cx: Connection, platform_name: str) -> str:
 
     # Linux
     if platform_name == "linux":
-        # We're just going to query /etc/os-release directly.
-        # Using lsb_release would be better, but it's less available
         result_id = cx.run("grep ^ID= /etc/os-release", hide=True, warn=True)
         result_like_id = cx.run(
             "grep ^ID_LIKE= /etc/os-release",
@@ -125,7 +127,7 @@ def flavor_detect(cx: Connection, platform_name: str) -> str:
 
         if result_id.failed:
             raise DataRefreshError(
-                "Failed to detect OS flavor via lsb identifier.",
+                "Failed to detect OS flavor via os-release identifier.",
                 stderr=result_id.stderr,
                 stdout=result_id.stdout,
             )
@@ -187,36 +189,31 @@ def version_detect(cx: Connection, flavor_name: str) -> str:
     if flavor_name.lower() not in SUPPORTED_FLAVORS:
         raise UnsupportedOSError(f"Unsupported OS flavor: {flavor_name}")
 
-    # Debian/Ubuntu
-    if flavor_name in ["ubuntu", "debian"]:
-        result_version = cx.run("lsb_release -s -r", hide=True, warn=True)
-
-        if result_version.failed:
-            raise DataRefreshError(
-                "Failed to detect OS version via lsb_release.",
-                stderr=result_version.stderr,
-                stdout=result_version.stdout,
+    # Linux flavors that rely on os-release metadata
+    # (which is all of them, at the time of writing)
+    if flavor_name in ["ubuntu", "debian", "rhel", "fedora"]:
+        result_version = None
+
+        # Some systems (debian sid, for instance) don't provide VERSION_ID,
+        # So we fall back to VERSION_CODENAME in these cases.
+        # If neither work, we just err on the side of failure.
+        for version_key in ["VERSION_ID", "VERSION_CODENAME"]:
+            result_version = cx.run(
+                f"grep ^{version_key}= /etc/os-release", hide=True, warn=True
             )
 
-        return result_version.stdout.strip()
-
-    # Redhat-likes
-    if flavor_name in ["rhel", "fedora"]:
-        result_version = cx.run(
-            "grep ^VERSION_ID= /etc/os-release", hide=True, warn=True
-        )
-
-        if result_version.failed:
-            raise DataRefreshError(
-                "Failed to detect OS version via os-release VERSION_ID.",
-                stderr=result_version.stderr,
-                stdout=result_version.stdout,
-            )
+            if not result_version.failed:
+                logger.debug("Found version using %s", version_key)
+                version_line = result_version.stdout.strip()
+                version_value = version_line.partition("=")[2].strip().strip("\"'")
 
-        version_line = result_version.stdout.strip()
-        version_value = version_line.partition("=")[2].strip().strip("\"'")
+                return version_value
 
-        return version_value.lower()
+        raise DataRefreshError(
+            "Failed to detect OS version via os-release VERSION_ID or VERSION_CODENAME.",
+            stderr=result_version.stderr if result_version else "",
+            stdout=result_version.stdout if result_version else "",
+        )
 
     # FreeBSD
     if flavor_name == "freebsd":