aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-09-16 17:38:18 +0100
committerGitHub <noreply@github.com>2016-09-16 17:38:18 +0100
commit4106767fd0fdc46e2bb9181639bfb2151c191f0f (patch)
tree438e43dbf8caab70c6ef661cfdd350b67d71602f
parent4ff663a0aeda35dd450d2a576da80dcd7c43de4e (diff)
parent8acf8fd36750f63f7636936279d3d5589b39723c (diff)
Merge pull request #25 from matrix-org/markjh/fix_jenkins
Fix jenkins.sh
-rwxr-xr-xjenkins.sh2
-rwxr-xr-xpython/olm/__main__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/jenkins.sh b/jenkins.sh
index 5c6eff7..3b6fb1f 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -3,7 +3,7 @@
set -e
make clean
-rm olm-*.tgz
+rm -f olm-*.tgz
make lib
make test
diff --git a/python/olm/__main__.py b/python/olm/__main__.py
index a34d52a..e06f267 100755
--- a/python/olm/__main__.py
+++ b/python/olm/__main__.py
@@ -327,7 +327,7 @@ def do_inbound_group(args):
sys.exit(1);
session = InboundGroupSession()
- session.init(credentials['message_index'], credentials['session_key'])
+ session.init(credentials['session_key'])
with open(args.session_file, "wb") as f:
f.write(session.pickle(args.key))