Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

args: drop config_channels (MR 2252)

Browse source 
This doesn't seem to be ever used, drop it.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-05-24 19:37:11 +02:00 • committed by Oliver Smith
parent fa804c9453
commit 52338c5e76
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pmb/core/types.py
View file

@ -52,7 +52,6 @@ class PmbArgs(Namespace):
cmdline: str
command: str
config: Path
config_channels: str
details: bool
details_to_stdout: bool
device: str

27
pmb/helpers/git.py
View file

@ -124,21 +124,18 @@ def parse_channels_cfg(args):
# Read with configparser
cfg = configparser.ConfigParser()
if args.config_channels:
cfg.read([args.config_channels])
else:
remote = get_upstream_remote(args, "pmaports")
command = ["git", "show", f"{remote}/master:channels.cfg"]
stdout = pmb.helpers.run.user_output(command, args.aports,
check=False)
try:
cfg.read_string(stdout)
except configparser.MissingSectionHeaderError:
logging.info("NOTE: fix this by fetching your pmaports.git, e.g."
" with 'pmbootstrap pull'")
raise RuntimeError("Failed to read channels.cfg from"
f" '{remote}/master' branch of your local"
" pmaports clone")
remote = get_upstream_remote(args, "pmaports")
command = ["git", "show", f"{remote}/master:channels.cfg"]
stdout = pmb.helpers.run.user_output(command, args.aports,
check=False)
try:
cfg.read_string(stdout)
except configparser.MissingSectionHeaderError:
logging.info("NOTE: fix this by fetching your pmaports.git, e.g."
" with 'pmbootstrap pull'")
raise RuntimeError("Failed to read channels.cfg from"
f" '{remote}/master' branch of your local"
" pmaports clone")
# Meta section
ret: Dict[str, Dict[str, str | Dict[str, str]]] = {"channels": {}}

3
pmb/parse/arguments.py
View file

@ -646,9 +646,6 @@ def get_parser():
default=pmb.config.defaults["config"],
help="path to pmbootstrap.cfg file (default in"
" ~/.config/)")
parser.add_argument("--config-channels",
help="path to channels.cfg (which is by default"
" read from pmaports.git, origin/master branch)")
parser.add_argument("-mp", "--mirror-pmOS", dest="mirrors_postmarketos",
help="postmarketOS mirror, disable with: -mp='',"
" specify multiple with: -mp='one' -mp='two',"