Skip to content

Commit

Permalink
fix: update ROM file collection
Browse files Browse the repository at this point in the history
  • Loading branch information
seppzer0 committed Sep 14, 2024
1 parent 2afd0ef commit c317943
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion builder/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def main(args: argparse.Namespace) -> None:
with open(dcfg.root / "pyproject.toml", encoding="utf-8") as f:
os.environ["KVERSION"] = f.read().split("version = \"")[1].split("\"")[0]
# create a config for checking and storing arguments
if args.defconfig:
if args.command != "assets" and args.defconfig:
args.defconfig = args.defconfig if args.defconfig.is_absolute() else Path.cwd() / args.defconfig
arguments = vars(args)
acfg = ArgumentConfig(**arguments)
Expand Down
8 changes: 4 additions & 4 deletions builder/core/assets_collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def assets(self) -> list:
else:
# add DFD alongside the ROM
print("\n", end="")
msg.done("ROM-only asset collection complete!")
return [self.rom_collector_dto, dfd]
msg.done("ROM-only asset collection specified")
return [self.rom_collector_dto.run(), dfd]
# process the full download
else:
assets = [
Expand Down Expand Up @@ -90,7 +90,7 @@ def assets(self) -> list:
"https://github.com/mozilla-mobile/firefox-android/releases/download/fenix-v117.1.0/fenix-117.1.0-arm64-v8a.apk",
"https://f-droid.org/F-Droid.apk",
]
# finally, add ROM (if kernel base is not universal) and DFD into assets list
# add ROM if kernel base is not universal
if self.rom_collector_dto:
assets.append(self.rom_collector_dto.run()) # type: ignore
return assets
Expand Down Expand Up @@ -126,7 +126,7 @@ def run(self) -> None:
# NOTE: call "self.assets" only once!
assets = self.assets
if isinstance(assets, list) or isinstance(assets, tuple):
for e in self.assets:
for e in assets:
if isinstance(e, GithubApiClient):
e.run()
else:
Expand Down
2 changes: 1 addition & 1 deletion builder/tools/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def done(text: str) -> None:
:param str text: Text to wrap.
"""
print(f"[ \u2713 ] {text}")
print(f"[ \u2713 ] {text}".encode("utf-8"))


def debug(text: str) -> None:
Expand Down

0 comments on commit c317943

Please sign in to comment.