forked from Mirror/pmbootstrap
WIP: start ripping out args (MR 2252)
Cease merging pmbootstrap.cfg into args, implement a Context type to let us pull globals out of thin air (as an intermediate workaround) and rip args out of a lot of the codebase. This is just a first pass, after this we can split all the state that leaked over into Context into types with narrower scopes (like a BuildContext(), etc). Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
parent
bfea00e03a
commit
34dd9d42ba
129 changed files with 1393 additions and 1300 deletions
|
@ -6,6 +6,7 @@ import enum
|
|||
from typing import Generator, Optional
|
||||
from pathlib import Path, PosixPath, PurePosixPath
|
||||
import pmb.config
|
||||
from .context import get_context
|
||||
|
||||
class ChrootType(enum.Enum):
|
||||
ROOTFS = "rootfs"
|
||||
|
@ -69,7 +70,7 @@ class Chroot:
|
|||
|
||||
@property
|
||||
def path(self) -> Path:
|
||||
return Path(pmb.config.work, self.dirname)
|
||||
return Path(get_context().config.work, self.dirname)
|
||||
|
||||
|
||||
@property
|
||||
|
@ -182,4 +183,4 @@ class Chroot:
|
|||
Glob all initialized chroot directories
|
||||
"""
|
||||
for pattern in Chroot.iter_patterns():
|
||||
yield from Path(pmb.config.work).glob(pattern)
|
||||
yield from Path(get_context().config.work).glob(pattern)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue