aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/__init__.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-01-09 16:40:32 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-01-09 16:40:32 +0100
commit40c28b79d1c1aa56584cb11ac599cb80d9e03e94 (patch)
tree856f5e2ec41cc9018d0500a461109e68d15f5edc /libmproxy/console/__init__.py
parent8af26bd0b7bbde32a95ce937afc178e75c51da71 (diff)
parentdcc248797f92ec8c5971849e6f907a6bd4f2a4a3 (diff)
downloadmitmproxy-40c28b79d1c1aa56584cb11ac599cb80d9e03e94.tar.gz
mitmproxy-40c28b79d1c1aa56584cb11ac599cb80d9e03e94.tar.bz2
mitmproxy-40c28b79d1c1aa56584cb11ac599cb80d9e03e94.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/console/__init__.py')
-rw-r--r--libmproxy/console/__init__.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index a8c728a9..7e770723 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -508,14 +508,22 @@ class ConsoleMaster(flow.FlowMaster):
def client_playback_path(self, path):
err, ret = self._readflow(path)
if err:
- self.statusbar.message(ret)
+ if not self.statusbar:
+ print >> sys.stderr, ret
+ sys.exit(1)
+ else:
+ self.statusbar.message(ret)
else:
self.start_client_playback(ret, False)
def server_playback_path(self, path):
err, ret = self._readflow(path)
if err:
- self.statusbar.message(ret)
+ if not self.statusbar:
+ print >> sys.stderr, ret
+ sys.exit(1)
+ else:
+ self.statusbar.message(ret)
else:
self.start_server_playback(
ret,