fix(pacstall): prioritises pacstall handling of deb files

Author: undefinederror

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.2] - 2026-04-10
+
+### Added
+- **Smart Pacstall Deduplication**: Added metadata parsing for `gives`, `provides`, and `replaces` fields. `upk` now correctly identifies Pacstall packages (like `bitwarden-deb`) as aliasing standard system packages, preventing duplicate entries and prioritizing clean removals.
+
 ## [1.2.1] - 2026-03-18
 
 ### Refactored

upk/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

upk/backends/base.py

@@ -13,6 +13,7 @@ class PackageInfo:
     source: str
     description: Optional[str] = None
     installed_version: Optional[str] = None
+    provides: List[str] = None
 
     @property
     def is_installed(self) -> bool:

upk/backends/pacstall.py

@@ -112,22 +112,35 @@ def _load_installed_cache(self) -> None:
                     name = line
 
                 if name:
-                    # Try to get version and description from metadata file if unknown
-                    if version == "unknown":
-                        metadata_path = f"/var/lib/pacstall/metadata/{name}"
-                        if os.path.exists(metadata_path):
-                            try:
-                                with open(metadata_path, 'r') as f:
-                                    for meta_line in f:
-                                        if meta_line.startswith('_version='):
-                                            version = meta_line.split('=', 1)[1].strip().strip('"').strip("'")
-                                            break
-                            except Exception:
-                                pass
+                    provides = []
+                    # Try to get metadata from file
+                    metadata_path = f"/var/lib/pacstall/metadata/{name}"
+                    if os.path.exists(metadata_path):
+                        try:
+                            with open(metadata_path, 'r') as f:
+                                for meta_line in f:
+                                    # Get version
+                                    if version == "unknown" and meta_line.startswith('_version='):
+                                        version = meta_line.split('=', 1)[1].strip().strip('"').strip("'")
+                                    
+                                    # Get gives/replaces/provides to link names
+                                    if meta_line.startswith(('_gives=', '_provides=', '_replaces=')):
+                                        val = meta_line.split('=', 1)[1].strip().strip('"').strip("'")
+                                        # Handle array format like ("name1" "name2")
+                                        if val.startswith('(') and val.endswith(')'):
+                                            val = val[1:-1].strip()
+                                            names = [n.strip().strip('"').strip("'") for n in val.split(' ')]
+                                            provides.extend([n for n in names if n])
+                                        else:
+                                            if val:
+                                                provides.append(val)
+                        except Exception:
+                            pass
 
                     self._installed_cache[name] = {
                         "version": version,
-                        "description": None 
+                        "description": None,
+                        "provides": list(set(provides)) # Deduplicate
                     }
         except (subprocess.TimeoutExpired, FileNotFoundError):
             self._installed_cache = {}
@@ -220,6 +233,7 @@ def list_packages(self) -> List[PackageInfo]:
                 version=info["version"],
                 source=self.name,
                 description=info.get("description"),
-                installed_version=info["version"]
+                installed_version=info["version"],
+                provides=info.get("provides", [])
             ))
         return packages

upk/upk.py

@@ -23,24 +23,38 @@ def get_version():
 
 def deduplicate_results(results: list) -> list:
     """
-    Deduplicate results when a package is reported by both APT and Pacstall.
-    Pacstall is preferred for removal and listing if it's the same package.
+    Deduplicate results when a package is reported by both APT and another backend.
+    Backends like Pacstall are preferred if they provide the same software.
     """
-    # Only care about installed packages for this specific deduplication
-    pacstall_installed = {p.name: p for p in results if p.source == 'pacstall' and p.is_installed}
-    if not pacstall_installed:
+    # Find all names provided by non-apt installed packages
+    non_apt_installed = [p for p in results if p.source != 'apt' and p.is_installed]
+    if not non_apt_installed:
         return results
 
+    # Map of names that should cause an APT package to be hidden
+    hidden_names = set()
+    for p in non_apt_installed:
+        hidden_names.add(p.name)
+        if p.provides:
+            for provided in p.provides:
+                hidden_names.add(provided)
+                
     final_results = []
-    for p in results:
-        # If it's an APT package that's also installed via Pacstall
-        if p.source == 'apt' and p.name in pacstall_installed:
-            # Transfer description to Pacstall if the latter is missing one
-            if not pacstall_installed[p.name].description and p.description:
-                pacstall_installed[p.name].description = p.description
-            # Skip this APT entry
+    apt_results = [p for p in results if p.source == 'apt']
+    other_results = [p for p in results if p.source != 'apt']
+    
+    for p in apt_results:
+        if p.name in hidden_names:
+            # This APT package is covered by another backend
+            # Transfer description to the provider if it's missing
+            for other in non_apt_installed:
+                if other.name == p.name or (other.provides and p.name in other.provides):
+                    if not other.description and p.description:
+                        other.description = p.description
             continue
         final_results.append(p)
+        
+    final_results.extend(other_results)
     return final_results
 
 @click.group(context_settings=dict(help_option_names=['-h', '--help']), name="upk")
@@ -430,9 +444,9 @@ def upgrade(package: str):
 
     if package:
         console.print(f"Checking where [bold cyan]{package}[/bold cyan] is installed...")
-        from .search import search_all_backends
-        results = search_all_backends(available_backends, package)
-        installed_sources = {pkg.source for pkg in results if pkg.name == package and pkg.is_installed}
+        from .search import list_all_backends
+        results = list_all_backends(available_backends)
+        installed_sources = {pkg.source for pkg in results if pkg.name.lower() == package.lower()}
 
         if not installed_sources:
             console.print(f"[yellow]No installed exact match for '{package}' found in any selected source.[/yellow]")