Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2018-07-31 11:50:05 +02:00
commit 2127e2a6ef
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -24,13 +24,15 @@ FROM alpine
MAINTAINER www.evennia.com MAINTAINER www.evennia.com
# install compilation environment # install compilation environment
RUN apk update && apk add python py-pip python-dev py-setuptools gcc musl-dev jpeg-dev zlib-dev bash RUN apk update && apk add python py-pip python-dev py-setuptools gcc \
musl-dev jpeg-dev zlib-dev bash py2-openssl procps
# add the project source # add the project source
ADD . /usr/src/evennia ADD . /usr/src/evennia
# install dependencies # install dependencies
RUN pip install --upgrade pip && pip install /usr/src/evennia --trusted-host pypi.python.org RUN pip install --upgrade pip && pip install -e /usr/src/evennia --trusted-host pypi.python.org
RUN pip install cryptography pyasn1 service_identity
# add the game source when rebuilding a new docker image from inside # add the game source when rebuilding a new docker image from inside
# a game dir # a game dir

4
evennia/commands/cmdset.py
View file

@ -296,9 +296,9 @@ class CmdSet(with_metaclass(_CmdSetMeta, object)):
result (any): An instantiated Command or the input unmodified. result (any): An instantiated Command or the input unmodified.
""" """
try: if callable(cmd):
return cmd() return cmd()
except TypeError: else:
return cmd return cmd
def _duplicate(self): def _duplicate(self):