forked from Mirror/pmbootstrap
drop args from helpers.git and chroot.apk (MR 2252)
be gone! Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
parent
52338c5e76
commit
1be8653935
17 changed files with 85 additions and 70 deletions
|
@ -20,12 +20,12 @@ def print_channel(args: PmbArgs) -> None:
|
|||
channel = pmaports_cfg["channel"]
|
||||
|
||||
# Get branch name (if on branch) or current commit
|
||||
path = pmb.helpers.git.get_path(args, "pmaports")
|
||||
ref = pmb.helpers.git.rev_parse(args, path, extra_args=["--abbrev-ref"])
|
||||
path = pmb.helpers.git.get_path("pmaports")
|
||||
ref = pmb.helpers.git.rev_parse(path, extra_args=["--abbrev-ref"])
|
||||
if ref == "HEAD":
|
||||
ref = pmb.helpers.git.rev_parse(args, path)[0:8]
|
||||
ref = pmb.helpers.git.rev_parse(path)[0:8]
|
||||
|
||||
if not pmb.helpers.git.clean_worktree(args, path):
|
||||
if not pmb.helpers.git.clean_worktree(path):
|
||||
ref += ", dirty"
|
||||
|
||||
value = f"{channel} (pmaports: {ref})"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue