pkgcore 0.12.46__tar.gz → 0.12.47__tar.gz

{pkgcore-0.12.46 → pkgcore-0.12.47}/NEWS.rst

@@ -2,6 +2,42 @@
 Release Notes
 =============
 
+----------------------------
+pkgcore 0.12.47 (2026-10-17)
+----------------------------
+
+Fixes
+~~~~~
+
+- ``pquery`` no longer crashes with ``NotImplementedError`` when a binpkg
+  repo is configured in ``repos.conf`` (Arthur Zamarin)
+
+- Remerging a package whose protected config file already has an identical
+  pending ``._cfg`` update reuses it instead of adding another
+  (Arthur Zamarin)
+
+- ``pkgcore.binpkg.xpak.Xpak``: close the binpkg after each read instead of
+  leaving it open until garbage collection (Arthur Zamarin)
+
+- A ``%`` in a ``pkgcore.conf`` value that isn't a valid interpolation is
+  reported as a config parsing error naming the file, instead of a traceback
+  (Arthur Zamarin)
+
+- ``pkgcore.fs.livefs.iter_scan``: with an ``offset``, stat the top entry inside
+  the offset rather than the host path of the same name, stop at a top entry
+  that is a file, and honor ``follow_symlinks`` below the top (Arthur Zamarin)
+
+- Version comparison treats the first version component as an integer, as PMS
+  and Portage do, so ``pkg-01`` equals ``pkg-1`` and ``=cat/pkg-1`` matches it
+  (Arthur Zamarin)
+
+- ``pquery --owns`` finds files through symlinked directories, so
+  ``/bin/ls`` matches ``/usr/bin/ls`` on merged-usr systems (Arthur Zamarin)
+
+- Support the ``profile-default-eapi`` profile format: profiles without an
+  ``eapi`` file use ``profile_eapi_when_unspecified`` from ``layout.conf``
+  instead of EAPI 0 (Arthur Zamarin)
+
 ----------------------------
 pkgcore 0.12.46 (2026-10-08)
 ----------------------------

{pkgcore-0.12.46 → pkgcore-0.12.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pkgcore
-Version: 0.12.46
+Version: 0.12.47
 Summary: package managing framework
 Author-email: Michał Górny <mgorny@gentoo.org>, Tim Harder <radhermit@gmail.com>, Brian Harring <ferringb@gmail.com>, Arthur Zamarin <arthurzam@gentoo.org>, Marien Zwart <marienz@gentoo.org>
 Maintainer-email: Arthur Zamarin <arthurzam@gentoo.org>

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/patom.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PATOM" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PATOM" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 patom \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pclean.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PCLEAN" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PCLEAN" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pclean \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pclonecache.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PCLONECACHE" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PCLONECACHE" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pclonecache \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pconfig.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PCONFIG" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PCONFIG" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pconfig \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pebuild.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PEBUILD" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PEBUILD" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pebuild \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pinspect.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PINSPECT" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PINSPECT" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pinspect \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pmaint.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PMAINT" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PMAINT" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pmaint \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pmerge.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PMERGE" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PMERGE" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pmerge \- Wrapper for running commandline scripts.
 .SH SYNOPSIS

{pkgcore-0.12.46 → pkgcore-0.12.47}/build/sphinx/man/pquery.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PQUERY" "1" "Oct 08, 2026" "0.12.46" "pkgcore"
+.TH "PQUERY" "1" "Oct 17, 2026" "0.12.47" "pkgcore"
 .SH NAME
 pquery \- Wrapper for running commandline scripts.
 .SH SYNOPSIS
@@ -268,7 +268,8 @@ match packages using a given EAPI
 .INDENT 0.0
 .TP
 .B \-\-owns owns
-exact match on an owned file/dir
+Match packages owning the given path. Symlinked parent directories
+are resolved, so \fB/bin/ls\fP matches \fB/usr/bin/ls\fP on merged\-usr.
 .UNINDENT
 .INDENT 0.0
 .TP

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/__init__.py

@@ -1,4 +1,4 @@
 __title__ = "pkgcore"
-__version__ = "0.12.46"
-__version_info__ = (0, 12, 46)
+__version__ = "0.12.47"
+__version_info__ = (0, 12, 47)
 __python_mininum_version__ = (3, 12, 0)

pkgcore-0.12.47/src/pkgcore/_verinfo.py

@@ -0,0 +1 @@
+version_info={'rev': '4f4c6a14ba13af45f21f8184ba2e3640b2a4cb11', 'date': 'Sat Oct 17 06:28:35 2026', 'timestamp': 1792218515, 'tag': '0.12.47', 'commits': 0}

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/binpkg/xpak.py

@@ -7,6 +7,7 @@ __all__ = ("MalformedXpak", "Xpak")
 import os
 import typing
 from collections import OrderedDict
+from contextlib import contextmanager
 
 from snakeoil import klass
 from snakeoil import struct_compat as struct
@@ -57,13 +58,15 @@ class Xpak:
         # keys_dict becomes an ordereddict after _load_offsets; reason for
         # it is so that reads are serialized.
 
-    @property
-    def _fd(self):
-        # we do this annoying little dance to avoid having a couple
-        # hundred fds open if they're accessing a lot of binpkgs
+    @contextmanager
+    def _open(self):
+        """Yield the source, opening a path per use and closing it after."""
+        # avoids a couple hundred open fds when accessing a lot of binpkgs
         if self._source_is_path:
-            return open(self._source, "rb")
-        return self._source
+            with open(self._source, "rb") as fd:
+                yield fd
+        else:
+            yield self._source
 
     @classmethod
     def write_xpak(cls, target_source, data):
@@ -137,7 +140,10 @@ class Xpak:
 
     @klass.jit_attr
     def keys_dict(self):
-        fd = self._fd
+        with self._open() as fd:
+            return self._read_keys(fd)
+
+    def _read_keys(self, fd):
         index_start, index_len, data_len = self._check_magic(fd)
         data_start = index_start + index_len
         keys_dict = OrderedDict()
@@ -200,13 +206,15 @@ class Xpak:
         return self.keys_dict.keys()
 
     def values(self):
-        fd = self._fd
-        return (self._get_data(fd, *v) for v in self.keys_dict.values())
+        with self._open() as fd:
+            for v in self.keys_dict.values():
+                yield self._get_data(fd, *v)
 
     def items(self):
         # note that it's an OrderedDict, so this works.
-        fd = self._fd
-        return ((k, self._get_data(fd, *v)) for k, v in self.keys_dict.items())
+        with self._open() as fd:
+            for k, v in self.keys_dict.items():
+                yield k, self._get_data(fd, *v)
 
     def __len__(self):
         return len(self.keys_dict)
@@ -221,7 +229,8 @@ class Xpak:
         return iter(self.keys_dict)
 
     def __getitem__(self, key):
-        return self._get_data(self._fd, *self.keys_dict[key])
+        with self._open() as fd:
+            return self._get_data(fd, *self.keys_dict[key])
 
     def __delitem__(self, key):
         del self.keys_dict[key]

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/config/cparser.py

@@ -30,10 +30,12 @@ def config_from_file(file_obj: typing.Iterable[str]) -> mappings.LazyValDict:
     cparser = CaseSensitiveConfigParser()
     try:
         cparser.read_file(file_obj)
-    except configparser.ParsingError as e:
+        # interpolate now, so a bad % is reported as a parse error of this file
+        sections = {name: dict(cparser.items(name)) for name in cparser.sections()}
+    except configparser.Error as e:
         raise errors.ParsingError(f"while parsing {file_obj}", e) from e
 
     def get_section(section):
-        return basics.ConfigSectionFromStringDict(dict(cparser.items(section)))
+        return basics.ConfigSectionFromStringDict(sections[section])
 
     return mappings.LazyValDict(cparser.sections, get_section)

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/ebuild/cpv.py

@@ -156,15 +156,16 @@ def ver_cmp(ver1: str, rev1: str, ver2: str, rev2: str) -> int:
         ver_parts2_len = len(ver_parts2)
 
         # Iterate through the components
-        for v1, v2 in zip(ver_parts1, ver_parts2):
+        for i, (v1, v2) in enumerate(zip(ver_parts1, ver_parts2)):
             # If the string components are equal, the numerical
             # components will be equal too.
             if v1 == v2:
                 continue
 
-            # If one of the components begins with a "0" then they
-            # are compared as floats so that 1.1 > 1.02; else ints.
-            if v1[0] != "0" and v2[0] != "0":
+            # The first component is always an integer (PMS algorithm 3.2).
+            # Later ones beginning with a "0" are compared as floats so
+            # that 1.1 > 1.02; else ints.
+            if i == 0 or (v1[0] != "0" and v2[0] != "0"):
                 v1 = int(v1)
                 v2 = int(v2)
             else:

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/ebuild/misc.py

@@ -5,7 +5,6 @@ misc. stuff we've not found a spot for yet.
 __all__ = (
     "ChunkedDataDict",
     "IncrementalsDict",
-    "PayloadDict",
     "chunked_data",
     "collapsed_restrict_to_data",
     "get_relative_dosym_target",
@@ -459,11 +458,6 @@ class ChunkedDataDict(GenericEquality):
                 "merge expects a ChunkedDataDict instance; "
                 f"got type {type(cdict)}, {cdict!r}"
             )
-        if isinstance(cdict, PayloadDict) and not isinstance(self, PayloadDict):
-            raise TypeError(
-                "merge expects a PayloadDataDict instance; "
-                f"got type {type(cdict)}, {cdict!r}"
-            )
         # straight extensions for this, rather than update_from_stream.
         d = self._dict
         for key, values in cdict._dict.items():
@@ -528,7 +522,6 @@ class ChunkedDataDict(GenericEquality):
             g_stream = _build_cp_atom_payload(
                 self._global_settings,
                 packages.AlwaysTrue,
-                payload_form=isinstance(self, PayloadDict),
                 interner=interner,
             )
         else:
@@ -540,7 +533,6 @@ class ChunkedDataDict(GenericEquality):
                 cache,
                 self._global_settings,
                 packages.AlwaysTrue,
-                payload_form=isinstance(self, PayloadDict),
             )
 
         if self.frozen:
@@ -557,7 +549,6 @@ class ChunkedDataDict(GenericEquality):
         return d
 
     def render_to_payload(self):
-        d = PayloadDict()
         d = {
             atom.atom(k): _build_cp_atom_payload(v, atom.atom(k), True)
             for k, v in self._dict.items()
@@ -586,43 +577,6 @@ class ChunkedDataDict(GenericEquality):
     pull_data = render_pkg
 
 
-class PayloadDict(ChunkedDataDict):
-    def mk_item(self, key, neg, pos):
-        return restrict_payload(key, tuple(chain(("-" + x for x in neg), pos)))
-
-    def add_bare_global(self, payload):
-        neg = [x[1:] for x in payload if x[0] == "-"]
-        pos = [x for x in payload if x[0] != "-"]
-        ChunkedDataDict.add_bare_global(self, neg, pos)
-
-    def add_global(self, pinst):
-        neg = [x[1:] for x in pinst.data if x[0] == "-"]
-        pos = [x for x in pinst.data if x[0] != "-"]
-        return ChunkedDataDict.add_global(self, chunked_data(pinst.restrict, neg, pos))
-
-    def update_from_stream(self, stream):
-        for pinst in stream:
-            if getattr(pinst.restrict, "key", None) is not None:
-                # atom, or something similar.  use the key lookup.
-                # hack also... recreate the restriction; this is due to
-                # internal idiocy in ChunkedDataDict that will be fixed.
-                self._dict[pinst.restrict.key].append(pinst)
-            else:
-                self.add_global(pinst)
-
-    def render_pkg(self, pkg, pre_defaults=()):
-        items = self._dict.get(atom.atom(pkg.key))
-        if items is None:
-            items = self._global_settings
-        s = set(pre_defaults)
-        data = chain.from_iterable(
-            item.data for item in items if item.restrict.match(pkg)
-        )
-        return incremental_expansion(data, orig=s)
-
-    pull_data = render_pkg
-
-
 def run_sanity_checks(pkgs, domain, threads=None):
     """Run all sanity checks for a sequence of packages."""
     sanity_failures = defaultdict(list)

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/ebuild/processor.py

@@ -374,6 +374,16 @@ def chuck_StoppingCommand(ebp, line):
         raise ProcessorError(args[1])
 
 
+def _bash_quote(val: str) -> str:
+    """Quote a value for a bash assignment."""
+    if val.isalnum():
+        return val
+    if "'" not in val:
+        return f"'{val}'"
+    escaped = val.replace("\\", "\\\\").replace("'", "\\'")
+    return f"$'{escaped}'"
+
+
 class EbuildProcessor:
     """Abstraction of a running ebd instance.
 
@@ -815,14 +825,12 @@ class EbuildProcessor:
                 )
 
             if isinstance(val, (list, tuple)):
-                assign = f"{key}=({' '.join(f'[{i}]="{value}"' for i, value in enumerate(val))})"
-            elif val.isalnum():
-                assign = f"{key}={val}"
-            elif "'" not in val:
-                assign = f"{key}='{val}'"
+                elements = " ".join(
+                    f"[{i}]={_bash_quote(value)}" for i, value in enumerate(val)
+                )
+                assign = f"{key}=({elements})"
             else:
-                escaped = val.replace("\\", "\\\\").replace("'", "\\'")
-                assign = f"{key}=$'{escaped}'"
+                assign = f"{key}={_bash_quote(val)}"
 
             (plain if key in nonexported else exported).append(assign)
 

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/ebuild/profiles.py

@@ -597,15 +597,25 @@ class ProfileNode(WeaklyCached):
     def _default_eapi(self):
         """EAPI used when the profile directory lacks its own eapi file.
 
-        Defaults to EAPI 0, unless the top-level profiles directory uses an EAPI
-        that enables the profile-eapi-default feature (EAPI 9+), in which case
-        that EAPI is inherited; see PMS.
+        If the top-level profiles directory uses an EAPI that enables the
+        profile-eapi-default feature (EAPI 9+), that EAPI is inherited; see PMS.
+        Otherwise it is the repo's ``profile_eapi_when_unspecified`` from
+        layout.conf, or EAPI 0.
         """
         repo_config = self.repoconfig
         if repo_config is not None:
             top_level = repo_config.eapi
             if top_level.options.profile_eapi_default:
                 return top_level
+        return self._layout_default_eapi()
+
+    def _layout_default_eapi(self):
+        repo_config = self.repoconfig
+        if (
+            repo_config is not None
+            and repo_config.profile_eapi_when_unspecified is not None
+        ):
+            return repo_config.profile_eapi_when_unspecified
         return get_eapi("0")
 
     @load_property("eapi", fallback=None)
@@ -678,7 +688,7 @@ class EmptyRootNode(ProfileNode):
     def _default_eapi(self):
         # this node *is* the top-level profiles directory, so its eapi is read
         # directly from profiles/eapi; avoid recursing back through repoconfig.
-        return get_eapi("0")
+        return self._layout_default_eapi()
 
 
 class ProfileStack:

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/ebuild/repo_objs.py

@@ -47,7 +47,7 @@ from ..restrictions import boolean, packages, restriction
 from . import atom, pkg_updates, profiles
 from .cpv import VersionedCPV
 from .digest import Manifest
-from .eapi import get_eapi
+from .eapi import EAPI, get_eapi
 
 
 def readlines_replace(path):
@@ -816,6 +816,7 @@ class RepoConfig(syncable.tree, immutable.Strict):
         "portage-1",
         "portage-2",
         "profile-bashrcs",
+        "profile-default-eapi",
         "profile-set",
     )
     supported_cache_formats = ("md5-dict", "pms")
@@ -975,6 +976,25 @@ class RepoConfig(syncable.tree, immutable.Strict):
                 profile_formats.add("pms")
         sf(self, "profile_formats", profile_formats)
 
+        default_eapi = data.get("profile_eapi_when_unspecified")
+        if default_eapi is not None:
+            if "profile-default-eapi" not in profile_formats:
+                logger.warning(
+                    f"{self.repo_id!r} repo at {self.location!r} sets "
+                    "profile_eapi_when_unspecified without the "
+                    "profile-default-eapi profile format, ignoring it"
+                )
+                default_eapi = None
+            elif default_eapi not in EAPI.known_eapis:
+                logger.warning(
+                    f"{self.repo_id!r} repo at {self.location!r} has unsupported "
+                    f"profile_eapi_when_unspecified EAPI {default_eapi!r}, ignoring it"
+                )
+                default_eapi = None
+            else:
+                default_eapi = get_eapi(default_eapi)
+        sf(self, "profile_eapi_when_unspecified", default_eapi)
+
     @klass.jit_attr
     def known_arches(self) -> frozenset[str]:
         """All valid KEYWORDS for the repo."""
@@ -1176,7 +1196,9 @@ class RepoConfig(syncable.tree, immutable.Strict):
     @klass.jit_attr
     def base_profile(self):
         pms_strict = "pms" in self.profile_formats
-        return profiles.EmptyRootNode(self.profiles_base, pms_strict=pms_strict)
+        node = profiles.EmptyRootNode(self.profiles_base, pms_strict=pms_strict)
+        object.__setattr__(node, "_repoconfig", self)
+        return node
 
     @klass.jit_attr
     def eapi(self):

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/ebuild/triggers.py

@@ -302,15 +302,14 @@ class ConfigProtectInstall(triggers.base):
 
             # now we rename.
             for fname, entry in entries:
-                # check for any updates with the same chksums.
+                # reuse the newest pending update if it's identical, as portage does
                 count = 0
-                for cfg_count, cfg_fname in updates[fname]:
-                    if simple_chksum_compare(
-                        livefs.gen_obj(pjoin(dir_loc, cfg_fname)), entry
-                    ):
-                        count = cfg_count
-                        break
-                    count = max(count, cfg_count + 1)
+                if updates[fname]:
+                    last = max(cfg_count for cfg_count, _ in updates[fname])
+                    last_obj = livefs.gen_obj(
+                        pjoin(dir_loc, f"._cfg{last:04d}_{fname}")
+                    )
+                    count = last if simple_chksum_compare(last_obj, entry) else last + 1
                 try:
                     install_cset.remove(entry)
                 except KeyError:

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/fs/livefs.py

@@ -131,7 +131,15 @@ def _internal_offset_iter_scan(
     path = normpath(path)
     dirs = collections.deque([path[len(offset) :]])
     if dirs[0]:
-        yield gen_obj(dirs[0], chksum_handlers=chksum_handlers, stat_func=stat_func)
+        obj = gen_obj(
+            dirs[0],
+            chksum_handlers=chksum_handlers,
+            real_location=path,
+            stat_func=stat_func,
+        )
+        yield obj
+        if not obj.is_dir:
+            return
 
     sep = os.path.sep
     while dirs:
@@ -148,7 +156,7 @@ def _internal_offset_iter_scan(
                 path,
                 chksum_handlers=chksum_handlers,
                 real_location=pjoin(real_base, x),
-                stat_func=os.lstat,
+                stat_func=stat_func,
             )
             yield obj
             if obj.is_dir:

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/landlock.py

@@ -30,6 +30,7 @@ from collections.abc import Iterator
 
 from snakeoil.cli import arghparse
 
+from .cache import base as cache_base
 from .exceptions import PkgcoreUserException
 from .log import logger
 
@@ -99,7 +100,10 @@ def writable_cache_paths(*repos) -> Iterator[str]:
     involved in a run grants no more than pkgcore would have written anyway.
     """
     for repo in repos:
-        for cache in getattr(repo, "cache", ()):
+        caches = getattr(repo, "cache", ())
+        if isinstance(caches, cache_base):
+            continue
+        for cache in caches:
             if cache.readonly:
                 continue
             # pkgcore creates a missing cache dir on demand and decides

{pkgcore-0.12.46 → pkgcore-0.12.47}/src/pkgcore/scripts/pquery.py

@@ -911,16 +911,55 @@ def parse_eapi(value):
     return packages.PackageRestriction("eapi", values.StrExactMatch(value))
 
 
-@bind_add_query("--owns", action="append", help="exact match on an owned file/dir")
-def parse_owns(value):
-    return packages.PackageRestriction(
-        "contents",
-        values.AnyMatch(
-            values.GetAttrRestriction("location", values.StrExactMatch(value))
-        ),
+def _stat_dir(root, path):
+    try:
+        return os.stat(os.path.join(root, os.path.dirname(path).lstrip(os.sep)))
+    except OSError:
+        return None
+
+
+def _owns_match(root, path, contents):
+    """Whether *contents* has *path*, also through symlinked parent dirs."""
+    if path in contents:
+        return True
+    name = os.path.basename(path)
+    if (parent := _stat_dir(root, path)) is None:
+        return False
+    return any(
+        obj.basename == name
+        and (st := _stat_dir(root, obj.location)) is not None
+        and os.path.samestat(st, parent)
+        for obj in contents
     )
 
 
+@bind_add_query(
+    "--owns",
+    action="append",
+    type=None,
+    default=[],
+    bind="final_converter",
+    help="match packages owning a file/dir",
+    docs="""
+        Match packages owning the given path. Symlinked parent directories
+        are resolved, so ``/bin/ls`` matches ``/usr/bin/ls`` on merged-usr.
+    """,
+)
+def owns_finalize(sequence, namespace):
+    if not sequence:
+        return []
+    root = namespace.domain.root
+    return [
+        packages.PackageRestriction(
+            "contents",
+            values.FunctionRestriction(
+                partial(_owns_match, root, os.path.normpath(value))
+            ),
+        )
+        for value in sequence
+    ]
+
+
 @bind_add_query(
     "--owns-re", action="append", help='like "owns" but using a regexp for matching'
 )