From c01cf127bea40da8fee4fda49760c181df98b4eb Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 13 Feb 2019 19:40:21 +0200 Subject: [PATCH] Fix blank module handling in mbc build and bump alpine base in dockerfile --- Dockerfile | 2 +- maubot/cli/commands/build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 591adfa..30959f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM node:10 AS frontend-builder COPY ./maubot/management/frontend /frontend RUN cd /frontend && yarn --prod && yarn build -FROM alpine:3.8 +FROM alpine:3.9 ENV UID=1337 \ GID=1337 diff --git a/maubot/cli/commands/build.py b/maubot/cli/commands/build.py index 3ab154e..81c7591 100644 --- a/maubot/cli/commands/build.py +++ b/maubot/cli/commands/build.py @@ -88,7 +88,7 @@ def write_plugin(meta: PluginMeta, output: Union[str, IO]) -> None: for module in meta.modules: if os.path.isfile(f"{module}.py"): zip.write(f"{module}.py") - elif os.path.isdir(module): + elif module is not None and os.path.isdir(module): zipdir(zip, module) else: print(Fore.YELLOW + f"Module {module} not found, skipping" + Fore.RESET)