From 09e7cc42ad7680b486daeea6a10c2cb2e7cd8725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Kj=C3=A6rstad?= Date: Fri, 13 Jul 2018 21:51:56 +0200 Subject: [PATCH 1/4] Changed http:// to https:// on BeamStat link Changed http:// to https:// on BeamStat link in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5dfe24df..c3dcb540 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ pseudo-mailing list: BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh Feel welcome to join chan "bitmessage", BM-2cWy7cvHoq3f1rYMerRJp8PT653jjSuEdY -which is on preview here: http://beamstat.com/chan/bitmessage +which is on preview here: https://beamstat.com/chan/bitmessage References ---------- From 996a48f298edfa997c8bad5d29763d3777785afd Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Sat, 7 Jul 2018 15:27:56 +0300 Subject: [PATCH 2/4] Confirmation for network switch --- src/bitmessageqt/__init__.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 5e4c18fd..aab1dd72 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2684,6 +2684,19 @@ class MyForm(settingsmixin.SMainWindow): def network_switch(self): dontconnect_option = not BMConfigParser().safeGetBoolean( 'bitmessagesettings', 'dontconnect') + reply = QtGui.QMessageBox.question( + self, _translate("MainWindow", "Disconnecting") + if dontconnect_option else _translate("MainWindow", "Connecting"), + _translate( + "MainWindow", + "Bitmessage will now drop all connectins. Are you sure?" + ) if dontconnect_option else _translate( + "MainWindow", + "Bitmessage will now start connecting to network. Are you sure?" + ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.Cancel, + QtGui.QMessageBox.Cancel) + if reply != QtGui.QMessageBox.Yes: + return BMConfigParser().set( 'bitmessagesettings', 'dontconnect', str(dontconnect_option)) BMConfigParser().save() From e1d2ead7019f30330a9999e49411a609839b6e41 Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Thu, 19 Jul 2018 14:06:34 +0300 Subject: [PATCH 3/4] Fix exception 'KeyError: None' in checkdeps introduced in e92a85e, Fixes #1316 --- src/depends.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/depends.py b/src/depends.py index 06150642..39f5e759 100755 --- a/src/depends.py +++ b/src/depends.py @@ -137,7 +137,7 @@ def detectOSRelease(): for line in osRelease: if line.startswith("NAME="): detectOS.result = OS_RELEASE.get( - line.split("=")[-1].strip().lower()) + line.replace('"', '').split("=")[-1].strip().lower()) elif line.startswith("VERSION_ID="): try: version = float(line.split("=")[1].replace("\"", "")) From 3b4d73d29115257734c0d54f54071fb77b41a1ad Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Sun, 22 Jul 2018 13:20:07 +0200 Subject: [PATCH 4/4] Travis should test mandatory dependencies - travis script tests mandatory dependencies - may require additional commits as I don't know exactly how travis handles errors from multiple scripts --- .travis.yml | 4 +++- checkdeps.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6b0e4916..5dbda892 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,6 @@ addons: - libcap-dev install: - python setup.py install -script: pybitmessage -t +script: + - python checkdeps.py + - pybitmessage -t diff --git a/checkdeps.py b/checkdeps.py index f261c924..28b1e559 100755 --- a/checkdeps.py +++ b/checkdeps.py @@ -11,6 +11,7 @@ Limitations: """ import os +import sys from distutils.errors import CompileError try: from setuptools.dist import Distribution @@ -161,5 +162,7 @@ if (not compiler or prereqs) and OPSYS in PACKAGE_MANAGER: if not compiler: compilerToPackages() prereqToPackages() + if mandatory: + sys.exit(1) else: print("All the dependencies satisfied, you can install PyBitmessage")