Skip to content

Commit

Permalink
De-duplicate the local-repo mountpoint in bootstrap
Browse files Browse the repository at this point in the history
The code that is being dropped is duplicated in package_manager.py.

Complements: d4c1269
Relates: #381
Relates: #357
Relates: #1414
Relates: #1286
  • Loading branch information
praiskup committed Sep 26, 2024
1 parent c5ba879 commit a20daa4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
13 changes: 0 additions & 13 deletions mock/py/mockbuild/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@

import distro

from mockbuild.mounts import BindMountPoint

from . import exception
from . import file_util
from . import text
Expand Down Expand Up @@ -1001,17 +999,6 @@ def _fix_cfg(cfg):

_fix_cfg(bootstrap.config)

if not baseurl.startswith("file:///") and not baseurl.startswith("/"):
return

local_dir = baseurl.replace("file://", "", 1)
if not local_dir or not os.path.isdir(local_dir):
return

mountpoint = bootstrap.make_chroot_path(local_dir)
bootstrap.mounts.add(BindMountPoint(srcpath=local_dir,
bindpath=mountpoint))


def subscription_redhat_init(opts, uidManager):
if not opts['redhat_subscription_required']:
Expand Down
5 changes: 5 additions & 0 deletions releng/release-notes-next/buildroot-mounts-redundancy.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
De-duplicating bootstrap mount points for local repositories used with `--chain`
or `--localrepo=file:///repo/on/host`. Caused eventual problems during
`--scrub=bootstrap`. This bug existed in Mock <= 5.6, but after fixing the
[issue#1414][], it got exposed by our test suite. Related issues include
[issue#357][] ([commit#a0a2cba3][]) and [issue#381][] ([commit#16462acc][]).

0 comments on commit a20daa4

Please sign in to comment.