timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #25 from matrix-org/markjh/fix_jenkins

Browse source 
Fix jenkins.sh
This commit is contained in:
Mark Haines 2016-09-16 17:38:18 +01:00 committed by GitHub
commit 4106767fd0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jenkins.sh
View file

@ -3,7 +3,7 @@
set -e set -e
make clean make clean
rm olm-*.tgz rm -f olm-*.tgz
make lib make lib
make test make test

2
python/olm/__main__.py
View file

@ -327,7 +327,7 @@ def do_inbound_group(args):
sys.exit(1); sys.exit(1);
session = InboundGroupSession() session = InboundGroupSession()
session.init(credentials['message_index'], credentials['session_key']) session.init(credentials['session_key'])
with open(args.session_file, "wb") as f: with open(args.session_file, "wb") as f:
f.write(session.pickle(args.key)) f.write(session.pickle(args.key))