From 6f4b2d79677c6287571c391c388bcca28cb38460 Mon Sep 17 00:00:00 2001 From: jackrobison Date: Tue, 19 Jan 2016 21:13:29 -0500 Subject: [PATCH 1/2] Delete x.sh --- x.sh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 x.sh diff --git a/x.sh b/x.sh deleted file mode 100755 index 1174512d8..000000000 --- a/x.sh +++ /dev/null @@ -1,3 +0,0 @@ -python setup.py install -clear -lbrynet-daemon From 4b9552fdf55b38c0c395a53e097d496c9a6b5bf1 Mon Sep 17 00:00:00 2001 From: jackrobison Date: Wed, 20 Jan 2016 12:55:15 -0500 Subject: [PATCH 2/2] Fix output from shutdown function --- lbrynet/lbrynet_daemon/LBRYDaemon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py index 8c7eede53..125ee5ad8 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemon.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py @@ -126,7 +126,7 @@ class LBRYDaemon(xmlrpc.XMLRPC): if self.session is not None: d = self.session.shut_down() else: - d = defer.Deferred() + d = defer.succeed(True) return d def _update_settings(self):